1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-19 14:33:21 +08:00
Commit Graph

6836 Commits

Author SHA1 Message Date
smoogipoo
714d93dd92 Merge remote-tracking branch 'origin/master' 2017-12-30 16:17:14 +09:00
Dean Herbert
f73f43fdad Merge remote-tracking branch 'upstream/master' into standard-hd-support 2017-12-30 14:48:19 +09:00
Dean Herbert
a0966305d4 Remove unnecessary new event 2017-12-30 14:46:44 +09:00
ColdVolcano
df62ca14b7 Don't unbind when not necessary 2017-12-29 23:41:36 -06:00
Dan Balasescu
2c4b4d19e0
Merge branch 'master' into supporter-tooltip 2017-12-30 13:44:59 +09:00
Dan Balasescu
a7135e2688
Merge branch 'master' into fix-import-dialog-icon 2017-12-30 13:15:33 +09:00
jai_
9660e0885b
correctly name tooltip interface 2017-12-29 19:20:37 +00:00
jai_
6de41ba172
Trim whitespace 2017-12-29 19:16:43 +00:00
jai_
b1dd64983d
Add tooltip text to supporter icon 2017-12-29 19:05:50 +00:00
Aergwyn
f547c7986d created option to override values before UpdateState is called 2017-12-29 17:50:55 +01:00
Dean Herbert
27cb445c24 Always recrusively apply custom sequence to nested hitobjects 2017-12-29 17:48:05 +09:00
Dean Herbert
3f8f778004
Merge branch 'master' into standard-hd-support 2017-12-29 15:56:38 +09:00
Dean Herbert
2ca10b28c6 Use a non-broken opentk library 2017-12-29 15:42:51 +09:00
FreezyLemon
d66d741af2 fixed constant naming 2017-12-28 22:11:10 +01:00
FreezyLemon
ae79be7b51 small style fixes plus new assert in test 2017-12-28 21:45:58 +01:00
ColdVolcano
3845c7ac7d Remove bluring of storyboard 2017-12-28 14:31:34 -06:00
FreezyLemon
7454633f63 Refactor and general tidying up 2017-12-28 20:11:21 +01:00
Aergwyn
b029f019b2 Merge branch 'master' into expand-social-tab 2017-12-28 19:36:22 +01:00
Aergwyn
66f076815f query friends endpoint to fetch friendlist 2017-12-28 19:32:06 +01:00
Dean Herbert
0cea018576 Use a more suiting (?) icon for import dialog
Closes #1763.
2017-12-28 21:24:40 +09:00
Dean Herbert
e0f23a056a Fix crash from being able to perform selection after entering play mode
Closes #1757
2017-12-28 21:07:19 +09:00
Dean Herbert
021717dfb4 Merge remote-tracking branch 'upstream/master' into standard-hd-support 2017-12-28 14:24:10 +09:00
Dean Herbert
e77dc368ba
Merge branch 'master' into fix-pause-overlay-selection 2017-12-28 14:01:36 +09:00
Dean Herbert
e4a8402d3c Use better logic
We need to still perform selection if selectedBeatmap itself is null
2017-12-28 12:38:40 +09:00
FreezyLemon
33480b85c8 fix for Drawables being empty crashing 2017-12-28 03:35:53 +01:00
FreezyLemon
998f9c090d select pause buttons after mouse move only 2017-12-28 01:56:10 +01:00
FreezyLemon
128603a99f Added more and fixed the old automated tests 2017-12-28 01:12:13 +01:00
Aergwyn
dbcf87267d Merge branch 'master' into standard-hd-support 2017-12-27 21:26:39 +01:00
FreezyLemon
54a11e24b7 Fixed links being removed too early 2017-12-27 21:13:32 +01:00
FreezyLemon
4681a0c47b handle chat == null gracefully and remove link from message if channel not found 2017-12-27 21:06:48 +01:00
Dean Herbert
4e6988d21b As it turns out, native directory separators are not supported 2017-12-28 01:05:50 +09:00
Dean Herbert
7a0662da4b Fix regression during merges 2017-12-28 00:38:50 +09:00
Dean Herbert
18eb74d38c
Merge branch 'master' into sliderbouncers-fix 2017-12-28 00:13:04 +09:00
Dan Balasescu
dcd994e65b
Merge branch 'master' into better-notification-delays 2017-12-27 23:58:04 +09:00
Dean Herbert
e6876c95ac
Merge branch 'master' into fix-notification-scheduled-events 2017-12-27 23:47:04 +09:00
Dan Balasescu
996e156fd0
Merge branch 'master' into fix-notification-scheduled-events 2017-12-27 23:27:23 +09:00
Dan Balasescu
3bfa6bd9fd
Merge branch 'master' into better-notification-delays 2017-12-27 23:26:57 +09:00
Dean Herbert
259e32f485
Merge branch 'master' into fix-beatmap-wedge-appear 2017-12-27 23:22:06 +09:00
Dan Balasescu
3a2dadc9d3
Fix spelling error 2017-12-27 23:14:48 +09:00
Dean Herbert
02f4705178
Merge branch 'master' into proper-taiko-hitsounds 2017-12-27 23:13:30 +09:00
Dean Herbert
07e0c423f5
Merge branch 'master' into fix-beatmap-wedge-appear 2017-12-27 22:58:50 +09:00
Dean Herbert
f68bf2e258
Merge branch 'master' into proper-taiko-hitsounds 2017-12-27 21:45:20 +09:00
Dan Balasescu
d99c6db4a1
Merge branch 'master' into fix-progress-notifications-close 2017-12-27 21:44:31 +09:00
Dean Herbert
3f73a9a693 Add better sample fallback logic
Also adds support for null channels at InputDrum level.
2017-12-27 21:44:04 +09:00
Dan Balasescu
3de07ddba8
Merge branch 'master' into fix-progress-notifications-close 2017-12-27 21:43:58 +09:00
Dean Herbert
9a4b2f0d1d Apply workaround at two levels 2017-12-27 21:19:06 +09:00
Dean Herbert
46ef17354e Simplify path construction 2017-12-27 21:05:16 +09:00
smoogipoo
6dfc596319 Post-merge fixes 2017-12-27 20:59:26 +09:00
smoogipoo
7a793eaded Merge master into netstandard 2017-12-27 20:48:53 +09:00
Dean Herbert
496b0fef01
Merge branch 'master' into proper-taiko-hitsounds 2017-12-27 20:40:16 +09:00
Dean Herbert
324a7d6377 Merge remote-tracking branch 'upstream/master' into better-testcase-player 2017-12-27 20:26:38 +09:00
Dean Herbert
7d0c94fd01 Fix notification overlay layout and scheduled tasks being delayed
Closes #1295
2017-12-27 19:42:44 +09:00
smoogipoo
b87e6c8b2a Add a method to get ruleset by name 2017-12-27 17:33:34 +09:00
Dan Balasescu
1af7f71c97
Merge branch 'master' into notification-verbosity 2017-12-27 15:01:28 +09:00
smoogipoo
de353ee6af Merge branch 'master' into proper-taiko-hitsounds 2017-12-27 14:59:26 +09:00
Dan Balasescu
f6e72706d9
Merge branch 'master' into fix-multiple-random-selects 2017-12-27 14:51:54 +09:00
Dean Herbert
2a7147240f Fix progress notifications not creating their completion notification early enough
FIxes notification overlay thinking it has no notifications left and closing.
2017-12-27 13:25:42 +09:00
smoogipoo
5b529511ec Update OpenTK nuget package
Fixes the recent AppVeyor errors
2017-12-27 13:18:34 +09:00
Dean Herbert
18d2be75d5 Fix random selection happening more than once on quick imports 2017-12-27 13:04:50 +09:00
smoogipoo
ddee9e992a Merge remote-tracking branch 'origin/master' into proper-taiko-hitsounds 2017-12-27 13:04:10 +09:00
Dean Herbert
cf9a9762f7 Fix beatmap wedge appearing with incorrect info on entering song select
Closes #1762
2017-12-27 13:02:21 +09:00
smoogipoo
b95d7fc2cd Revert "Make ControlPointInfo return a set default control point"
This reverts commit 3113a55a98.
2017-12-27 12:41:59 +09:00
Dean Herbert
ae9f08f387 Fix crash in editor when trying to seek on a virtual track 2017-12-27 11:47:04 +09:00
Dean Herbert
d17f6cb564 Fix crash when starting play mode with no beatmap
Closes #1767
2017-12-27 11:46:44 +09:00
FreezyLemon
c4f5754f94 Fixed only the links being italics for /me messages 2017-12-27 02:14:45 +01:00
Aergwyn
4c2554595e implement hidden (mostly)
some things work and others don't, I dunno
2017-12-26 17:25:18 +01:00
Dean Herbert
94449ed597
Merge branch 'master' into notification-verbosity 2017-12-26 20:48:59 +09:00
Dean Herbert
35ae5173cd
Merge branch 'master' into better-notification-delays 2017-12-26 20:48:41 +09:00
Dean Herbert
3182c22c7d Merge remote-tracking branch 'upstream/master' into hide-useless-beatmap-info 2017-12-26 20:36:22 +09:00
Dean Herbert
7504cd589d Move alpha handling to state 2017-12-26 20:18:47 +09:00
smoogipoo
d479955e20 Fix spelling error 2017-12-26 20:01:02 +09:00
smoogipoo
9690591593 Make taiko use namespaced hitsounds
This is a temporary solution for now that uses DrawableHitObject.SampleNamespace for the override. We will not want to do this going forward, and instead have the rulesets add their custom resource stores to the games', but that requires deciding where/when to apply/remove such resource stores, and is probably left to skinning.
2017-12-26 19:55:56 +09:00
Aergwyn
f5d4ed2a22 add interface to adjust DrawableHitObjects 2017-12-26 11:49:42 +01:00
Dean Herbert
ee67e7119d Merge remote-tracking branch 'upstream/master' into fix-info-wedge 2017-12-26 19:44:28 +09:00
Aergwyn
44fbe7859a move anchor and origin so metadata doesn't move if it's partially empty 2017-12-26 11:34:26 +01:00
smoogipoo
3113a55a98 Make ControlPointInfo return a set default control point 2017-12-26 19:33:01 +09:00
smoogipoo
836d807f4f Give SampleControlPoint a 100% volume by default 2017-12-26 19:32:20 +09:00
Dan Balasescu
460eeafd32
Merge branch 'master' into quieter-notifications 2017-12-26 18:18:28 +09:00
Dean Herbert
cf71ffdb6c
Merge branch 'master' into fix-taiko-stronghit 2017-12-26 18:06:07 +09:00
Dan Balasescu
11542b697c
Merge branch 'master' into improve-screen-offset 2017-12-26 17:53:13 +09:00
Dean Herbert
ab6c93fba4
Merge branch 'master' into notification-verbosity 2017-12-26 16:14:24 +09:00
Dean Herbert
3524ad3dc2 Merge remote-tracking branch 'upstream/master' into better-notification-delays 2017-12-26 16:10:57 +09:00
Dean Herbert
f737a64189 Remove ScreenChanged 2017-12-26 16:09:40 +09:00
Dan Balasescu
f7a54a203b
Merge branch 'master' into beatmap-import-prompt 2017-12-26 16:00:37 +09:00
Dean Herbert
c15b2382a2 Remove unused variable 2017-12-26 15:56:32 +09:00
Dean Herbert
24d8d357d0 Only bounce and flash notification count when increasing 2017-12-26 15:54:37 +09:00
Dean Herbert
45b3acdd6f Fix progress notifications not closing properly when opening their continuation 2017-12-26 15:54:33 +09:00
Dean Herbert
ed1df94f77 Fix unread light not turning off 2017-12-26 15:54:28 +09:00
Dan Balasescu
ef0031a719
Merge branch 'master' into popup-word-wrap 2017-12-26 15:47:58 +09:00
Dan Balasescu
d089e27cad
Merge branch 'master' into osu-prefixed-text 2017-12-26 15:40:29 +09:00
Dean Herbert
9ccc49c9b5 Make selection triggering more liberal 2017-12-26 15:32:39 +09:00
Dan Balasescu
ad811961a7
Merge branch 'master' into quieter-notifications 2017-12-26 15:30:12 +09:00
Dean Herbert
ed7ae4e956
Merge branch 'master' into fix-info-wedge 2017-12-26 15:08:52 +09:00
Dean Herbert
99a44e6d79 Allow testbrowser's rate adjust to affect TestCasePlayer 2017-12-26 15:03:45 +09:00
Dean Herbert
9fb958eadc Make TestCasePlayer more usable
No results screen crash, no unnecessary leadin time.
2017-12-26 14:23:14 +09:00
smoogipoo
14162b5d46 Make InputDrum handle all Normals/Claps, hitobjects all others 2017-12-26 14:18:23 +09:00
Dean Herbert
09ce24a7db Switch to a better way of deciding on null selection
This avoids `SelectionChanged` potentially being invoked multiple times after `selectedBeatmapSet` is already `null`.
2017-12-26 13:41:02 +09:00
Dean Herbert
2473f6de46
Merge branch 'master' into fix-hiding-last-map 2017-12-26 13:32:33 +09:00
smoogipoo
58c35b8ba5 Merge remote-tracking branch 'FreezyLemon/master' into fix-taiko-stronghit 2017-12-26 12:28:40 +09:00
ColdVolcano
bc90793b1c Trim whitespace 2017-12-25 19:18:57 -06:00
ColdVolcano
044e4d0acd Add blur to background in Player 2017-12-25 19:11:49 -06:00
FreezyLemon
c737e5245e Removed unnecessary SelectNext() call and change to dummy map when no items present 2017-12-26 01:50:05 +01:00
FreezyLemon
cbfef7052e further CI adjustments 2017-12-25 21:02:48 +01:00
FreezyLemon
7c49becc83 CI adjustments 2017-12-25 20:56:20 +01:00
FreezyLemon
962e4d7c8a Removed LinkId and word wrapping (for now).
Also reimplemented the OsuHoverContainer properly
2017-12-25 20:46:04 +01:00
FreezyLemon
025d3941a2 Fixed problems introduced by the merge 2017-12-25 19:43:35 +01:00
FreezyLemon
a30448095e Merge branch 'master' into url-parsing-support 2017-12-25 19:12:23 +01:00
Dean Herbert
7f7a4b8638
Merge branch 'master' into fix-null-ref 2017-12-26 02:58:57 +09:00
Dean Herbert
798c2c6666 Add special logic to song select to avoid obvious clipping when notifications are displayed
Not sure if we will keep this going forward (there will likely be an opaque tab control on the notifications overlay similar to options) but let's go with this for now.
2017-12-26 02:52:43 +09:00
Dean Herbert
d8f0844742 Fix null reference in release builds
Intro may not be initialised yet
2017-12-26 02:51:53 +09:00
Dean Herbert
0886107ec9 Connect counter with button display 2017-12-26 01:56:57 +09:00
Dean Herbert
1fc240f6c5 Expose unread notification count 2017-12-26 01:50:05 +09:00
Dean Herbert
bb33d0211a Add a count of unread notifications to the toolbar 2017-12-26 01:36:58 +09:00
Dean Herbert
dff082ed94 Make toolbar testable and add the most basic of visual tests 2017-12-26 01:12:46 +09:00
Dean Herbert
3c8d30f8e6 Add a dialog offering to import beatmaps from stable 2017-12-26 00:52:11 +09:00
Dean Herbert
3c1654e5e4 Fix many instances of non-osu-prefixed text classes being used
Results in incorrect default formatting.
2017-12-26 00:44:35 +09:00
Dean Herbert
929633efaa Make body text in popups word wrap properly 2017-12-26 00:38:35 +09:00
Aergwyn
0fe78bee6e center user panels 2017-12-25 16:11:50 +01:00
Aergwyn
bb4b5bebf9 fix supporter icon in profile missing its background
also it doesn't show up on profiles without supporter anymore
2017-12-25 15:30:42 +01:00
Aergwyn
e2a1b18a2c fix selecting different tab causing filter to change by itself
and minor cleanup
2017-12-25 14:17:35 +01:00
Dean Herbert
71a94d6b44 Add a bindable Enabled flag to NotificationManager
Also better handles delays before notifications are displayed.
2017-12-25 20:53:23 +09:00
Dean Herbert
861bf55773 Adjust notification padding a touch 2017-12-25 18:31:32 +09:00
Dean Herbert
96e4518e60 Add thread safety 2017-12-25 18:22:58 +09:00
Dean Herbert
6f5f4f76e5 Use Logger.Error when exceptions are involved 2017-12-25 18:21:15 +09:00
Dean Herbert
320a6b0480 Reduce notification output when exceptions are encountered 2017-12-25 18:20:52 +09:00
smoogipoo
0fb620a8d3 Make HitObject.Samples non-nullable 2017-12-25 16:41:18 +09:00
smoogipoo
d288d8a51f Remove SampleInfoList 2017-12-25 15:40:01 +09:00
Aergwyn
f00676e6ee initial commit to allow filtering / selecting different tabs / etc
still wip tho
bleh


bleh
2017-12-24 20:25:23 +01:00
Dean Herbert
fa95612fb7 Merge remote-tracking branch 'upstream/master' into fix-info-wedge 2017-12-25 01:06:56 +09:00
Dean Herbert
22338287d0
Merge branch 'master' into fix-taiko-stronghit 2017-12-25 00:37:10 +09:00
Aergwyn
68a00235b9 simplify offset calculation for background 2017-12-24 14:32:56 +01:00
Dean Herbert
7cbf271645
Merge branch 'master' into add-nofitication-overlay-push-bg 2017-12-24 21:52:14 +09:00
Aergwyn
5b22c5a453 reduce code duplication to move intro background 2017-12-24 10:28:37 +01:00
Dean Herbert
482e10966c Ensure a selection is made on entering song select if no selection is current 2017-12-24 17:02:56 +09:00
Dean Herbert
cf316b3c51 Add tests for initial load states of PlaySongSelect 2017-12-24 15:39:25 +09:00
Aergwyn
2ffc479411 let NotificationOverlay move the background 2017-12-23 14:56:23 +01:00
Aergwyn
9bb0cda525 fix NotificationOverlay going out of bounds at the bottom
also fixes the overlap with the Toolbar at the top
2017-12-23 14:33:43 +01:00
Dean Herbert
8e644e878a Merge remote-tracking branch 'upstream/master' into fix-info-wedge 2017-12-23 21:40:27 +09:00
smoogipoo
68d76d4380 Fix taiko strong hits not being handled 2017-12-23 20:58:09 +09:00
Aergwyn
1d67746d32 fix crash in SongSelect when traversing while zero beatmaps are loaded 2017-12-23 12:53:11 +01:00
Dean Herbert
117b744e37 Merge branch 'master' into fix-info-wedge 2017-12-23 20:36:24 +09:00
Dan Balasescu
7ec4d230b9
Merge branch 'master' into fix-leaderboard-placeholder 2017-12-23 20:04:05 +09:00
Dean Herbert
aeafa5645a Make Samples null by default and prepopulate in mania 2017-12-23 18:06:46 +09:00
Dean Herbert
2db68df999 Simplify DrawableHitObject's sample load code 2017-12-23 17:20:14 +09:00
Dean Herbert
9ca03c0209 Simplify and tidy sample retrieval
Less static weirdness
2017-12-23 16:46:02 +09:00
Dean Herbert
5026c7a95e SoundControlPoint -> SampleControlPoint 2017-12-23 16:34:34 +09:00
Dean Herbert
ff0927e71b Remove unnecessary newline 2017-12-23 16:23:33 +09:00
Dean Herbert
46865bbacd Merge remote-tracking branch 'upstream/master' into taiko-hitsounds-fix
# Conflicts:
#	osu.Game/Audio/SampleInfo.cs
2017-12-23 14:50:35 +09:00
Dean Herbert
1fa9dac1bb Merge remote-tracking branch 'origin/master' into taiko-hitsounds-fix 2017-12-23 14:20:16 +09:00
Dean Herbert
77f1b59853
Merge branch 'master' into fix-info-wedge 2017-12-23 04:04:18 +09:00
Aergwyn
6a8fd74e05 fix failing tests
1) waiting for loading to finish so Drawables are all present to do asserts on
2) fix NullRef in ResultPage because of removed line in DummyWorkingBeatmap (author one)
2017-12-22 17:38:22 +01:00
Dean Herbert
4d40004e97
Merge branch 'master' into beatmap-serialization 2017-12-22 22:45:00 +09:00
Dean Herbert
bdda1570d1 Move Placeholder classes to own files 2017-12-22 22:44:18 +09:00
Dean Herbert
26bb3715fe Improve state and feel of leaderboard placeholders
Closes #1721.
2017-12-22 22:42:23 +09:00
Dean Herbert
2313ff0ddb Fix beatmap info wedge not showing up when zero beatmaps are loaded
Closes #1722.
2017-12-22 22:19:11 +09:00
smoogipoo
6a29f6020a Make HitObjects construct nested hit objects 2017-12-22 21:42:54 +09:00
Aergwyn
ed827d5424 more visual tests for BeatmapInfoWedge
also fix Author showing when not wanted
2017-12-22 12:33:52 +01:00
Dean Herbert
e5faced9ba Better variable name 2017-12-22 19:25:59 +09:00
Dean Herbert
82909f6585 RankChart -> RankGraph 2017-12-22 19:25:18 +09:00
Dean Herbert
1a318c5c2b Improve LineGraph invalidation logic 2017-12-22 18:58:35 +09:00
EVAST9919
8c50fa0b84 Add testcase 2017-12-22 18:57:23 +09:00
EVAST9919
938c5feea4 Simplify interaction condition 2017-12-22 18:45:10 +09:00
EVAST9919
94a974a397 Use bindable for a user 2017-12-22 18:45:10 +09:00
EVAST9919
e48c515d52 CI fixes 2017-12-22 18:45:10 +09:00
EVAST9919
5ffdaf711e Remove useless array 2017-12-22 18:45:10 +09:00
EVAST9919
f3c93c894b Rank graph improvements 2017-12-22 18:45:10 +09:00
Aergwyn
07f55a2a60 remove references to DummyWorkingBeatmap
determine content by data that is present instead
2017-12-22 10:18:25 +01:00
Dan Balasescu
a3d947301b
Merge branch 'master' into beatmap-serialization 2017-12-22 07:38:05 +09:00
Aergwyn
214154c512 hide unnecessary lines on empty BeatmapInfoWedge
adding back deleted line

ooops
meh
2017-12-21 20:23:10 +01:00
Dean Herbert
aa388885b7 Adjust animation slightly 2017-12-22 00:53:34 +09:00
Dean Herbert
5c9d484395 Adjust debounce a bit 2017-12-22 00:50:32 +09:00
Dean Herbert
40ceaf12f2
Merge branch 'master' into leaderboard-scopes 2017-12-22 00:44:24 +09:00
Dean Herbert
40587411c1
Merge branch 'master' into add-confirmation-dialog 2017-12-22 00:32:25 +09:00
Dean Herbert
2526ebbbdc
Merge branch 'master' into remove-unnecessary-blocking 2017-12-22 00:18:02 +09:00
Dan Balasescu
ae4abf0f2b
Merge branch 'master' into remove-unnecessary-blocking 2017-12-21 23:55:48 +09:00
Dean Herbert
eb1b1da732
Merge branch 'master' into overlays-block-keyboard 2017-12-21 23:51:46 +09:00
Dean Herbert
57fdbda16d Remove unnecessary IsLoaded check
We are always loaded at this point.
2017-12-21 23:48:48 +09:00
Dean Herbert
65e6206d06 Use local bindable 2017-12-21 23:48:35 +09:00
Dean Herbert
13fee5402a Remove unnecessary using
visual studio doesn't save
2017-12-21 23:20:11 +09:00
Dean Herbert
38703e6b85
Merge branch 'master' into add-confirmation-dialog 2017-12-21 22:56:31 +09:00
Dean Herbert
620e9737c3 Avoid many many unnecessary enumerations 2017-12-21 22:33:16 +09:00
Dean Herbert
a9039c71e0 Merge branch 'master' into undelete-button-add 2017-12-21 22:32:08 +09:00
Dean Herbert
87e790080b Remove manual audio thread synchronisation logic
No longer required as calls are blocking.
2017-12-21 22:22:28 +09:00
Dan Balasescu
5cd2a3950e
Merge branch 'master' into overlays-block-keyboard 2017-12-21 22:15:03 +09:00
smoogipoo
790aa8be2a Merge master into beatmap-serialization 2017-12-21 22:13:53 +09:00
smoogipoo
866d1c6e0f Remove now unused references 2017-12-21 22:13:18 +09:00
Dean Herbert
4bd2c7e95f Fix minor formatting issue 2017-12-21 21:54:46 +09:00
Dean Herbert
abe465358c Fix formatting 2017-12-21 21:46:57 +09:00
naoey
644aaa8167 Unsubscribe from API state change event. 2017-12-21 18:00:10 +05:30
Dean Herbert
63f2436220
Merge branch 'master' into leaderboard-scopes 2017-12-21 21:18:56 +09:00
Dean Herbert
5b596765c8
Merge branch 'master' into dev-overlay-counter 2017-12-21 21:09:40 +09:00
FreezyLemon
e4ead36544 Added completion text 2017-12-21 13:01:14 +01:00
FreezyLemon
cbc1aacf5c Merge branch 'master' of https://github.com/ppy/osu into undelete-button-add 2017-12-21 13:00:11 +01:00
Seokho Song
6fbd06f967 Fix Not update retry counter on PauseOverlay
I've find "You've retried xx time(s)" message that something weird.
That is not displayed pause overlay and only see count on FailOverlay
I change code that PauseContainer.Retries property can be set call-back function.

Signed-off-by: Seokho Song <0xdevssh@gmail.com>
2017-12-21 20:40:31 +09:00
smoogipoo
d80079a73a Merge remote-tracking branch 'origin/master' into beatmap-serialization 2017-12-21 20:15:01 +09:00
Dan Balasescu
50afc6e9c9
Merge branch 'master' into fix-gameplay-menu-blocking 2017-12-21 20:07:14 +09:00
smoogipoo
2fb8895e66 Add spacer to menu 2017-12-21 19:57:09 +09:00
smoogipoo
b2c0b013aa Remove migration setting in favour of export option in the editor 2017-12-21 19:56:12 +09:00
Dean Herbert
052badc1bd Add a right-click context option to carousel panels to view online beatmap details 2017-12-21 19:42:44 +09:00
smoogipoo
a3fcc0b60c Back to using SortedLists 2017-12-21 19:40:41 +09:00
Dean Herbert
1895b16d67 Correctly make fullscreen overlays block keyboard input from drawables behind them
- [ ] Depends on #1711 to get correct global binding handling.
2017-12-21 19:34:20 +09:00
Dean Herbert
b6fd5b0f17 Fix keyboard and mouse input not properly getting blocked by GameplayMenuOverlay 2017-12-21 19:19:08 +09:00
naoey
01c4b1e544 Maintain a placeholder state and add tests showing all the states.
- Also don't replace placeholder if new one is same as old
2017-12-21 15:27:20 +05:30
Dean Herbert
fdfc596abe
Merge branch 'master' into add-confirmation-dialog 2017-12-21 18:45:52 +09:00
smoogipoo
cb7e192aff Determine SampleInfo defaults in DrawableHitObject 2017-12-21 16:02:33 +09:00
smoogipoo
58859f2ffb Rework registration/instantiation of decoders to not rely on reflection 2017-12-21 15:34:00 +09:00
smoogipoo
22f8853f49 Serialize star difficulty for now 2017-12-21 14:44:51 +09:00
smoogipoo
e8e5e8270b Rename decoder 2017-12-21 14:19:37 +09:00
smoogipoo
bfa4f1a2c3 Apply changes in line with master changes 2017-12-21 13:59:03 +09:00
smoogipoo
c99ea32574 Merge branch 'master' into beatmap-serialization 2017-12-21 13:39:39 +09:00
Dan Balasescu
e051353dad
Merge branch 'master' into add-deselect-mods-button 2017-12-21 11:54:46 +09:00
Dean Herbert
afcb9912e4 Reorder API / logged in checks to make more sense 2017-12-21 03:11:44 +09:00
Dean Herbert
2ff351c6cb Show retrieval failure when OnlineBeatmapID is missing 2017-12-21 03:10:09 +09:00
Aergwyn
ebc2ad55f8 greatly expanded tests for ModSelectOverlay 2017-12-20 19:05:23 +01:00
naoey
85dee3abac Increase GetScoresRequest timeout & leave existing scores when API dies. 2017-12-20 20:48:30 +05:30
naoey
8d24a04641 Remove unused usings. 2017-12-20 20:26:59 +05:30
naoey
c8c8b6810a Kill ugly retry button bounce. 2017-12-20 20:11:48 +05:30
naoey
23f4799840 Create placeholder classes instead of changing Children.
- Add MessagePlaceholder
- Use MessagePlacholder for when API is offline/user isn't a supporter
- Remove unnecessary placeholderFlow field
- Hook into API state changes
2017-12-20 20:00:52 +05:30
Dean Herbert
6d471da459 Remove unnecessary workaround 2017-12-20 21:52:03 +09:00
Dean Herbert
3292ef33fd Fix test edge cases 2017-12-20 21:16:19 +09:00
Dean Herbert
c871a25dfa Remove unnecessary constructure and make ruleset required 2017-12-20 20:41:01 +09:00
Dean Herbert
1b91f24044 Simplify scope logic 2017-12-20 20:33:16 +09:00
Dean Herbert
63dce59c8c Throw an exception if we try and retrieve local scores online 2017-12-20 20:28:00 +09:00
Dean Herbert
21829ba37b
Merge branch 'master' into leaderboard-scopes 2017-12-20 20:17:11 +09:00
Dean Herbert
fc0b97065c Move hover sound/container to base implementation 2017-12-20 15:54:13 +09:00
Dean Herbert
a6496e35ec Merge branch 'master' into url-parsing-support 2017-12-20 14:41:12 +09:00
FreezyLemon
270d81f816 Made the Link's OnClick() Method return true 2017-12-19 19:37:43 +01:00
FreezyLemon
4f8bec8dfc Removed makeshift fix that has already been addressed elsewhere. 2017-12-19 19:35:42 +01:00
Dean Herbert
9940d4630f
Merge branch 'master' into customize-progress-notification 2017-12-20 02:52:57 +09:00
FreezyLemon
3644eda9a9 Changed notification from "installed" to "imported" on beatmap download 2017-12-19 11:34:23 +01:00
Aergwyn
bfe986230d Merge branch 'master' into add-confirmation-dialog 2017-12-18 17:29:06 +01:00
Aergwyn
6ac33e3c00 made DeleteAll-button pink 2017-12-18 17:04:35 +01:00
Dean Herbert
c8afc553cb Fix profile header not correctly being masked
Closes #1592.
2017-12-18 23:55:34 +09:00
Dean Herbert
051a3c4d47 Fix line endings 2017-12-18 21:51:00 +09:00
Dean Herbert
a74ac278fe Merge remote-tracking branch 'upstream/master' into editor-selection-tool 2017-12-18 21:48:01 +09:00
smoogipoo
fabf1bf60a Make the captured objects not update for now
Since this is not the intended functionality.
2017-12-18 19:31:03 +09:00
smoogipoo
5493493f82 FinishCapture -> FinishDrag from Handles 2017-12-18 19:24:41 +09:00
smoogipoo
09c51df2bd Marker* -> Handle 2017-12-18 19:21:26 +09:00
smoogipoo
3999940538 DragSelector -> HitObjectSelectionBox 2017-12-18 19:17:26 +09:00
FreezyLemon
ba614883ea used Any() instead of manually checking count == 0 (CI) 2017-12-18 11:16:57 +01:00
FreezyLemon
f898481523 Changed existing implementations to have a custom CompletionText 2017-12-18 11:14:07 +01:00
smoogipoo
5e111e14db Make it possible to change the overlay actions beyond instantiation 2017-12-18 19:13:25 +09:00
smoogipoo
a17b2e4c18 Expose buttons for test cases 2017-12-18 19:13:08 +09:00
FreezyLemon
7c9d11756e Add the ability to change what text is displayed when a ProgressNotification finishes its task. 2017-12-18 10:59:25 +01:00
FreezyLemon
d2b80fdbfc Moved "undelete all" logic to BeatmapManager and added a progress notification 2017-12-18 10:55:07 +01:00
smoogipoo
918e7c9a4b MenuOverlay -> GameplayMenuOverlay 2017-12-18 16:40:50 +09:00
smoogipoo
cf640d084e Use using 2017-12-18 16:38:15 +09:00
smoogipoo
846750a190 Remove unnecessary flag 2017-12-18 16:36:11 +09:00
smoogipoo
5f538f03ea Comments 2017-12-18 16:34:25 +09:00
smoogipoo
59365bbdce Make MenuOverlay support key selections 2017-12-18 16:34:17 +09:00
Dean Herbert
4c45102d61
Merge branch 'master' into undelete-button-add 2017-12-18 16:28:32 +09:00
smoogipoo
8fdaf6f8f4 Restructure DialogButton to support selection 2017-12-18 14:47:17 +09:00
Dan Balasescu
812181190e
Update SelectionLayer.cs 2017-12-18 14:10:14 +09:00
smoogipoo
f3a5258c5b Reorder file (ctor + bdl) 2017-12-18 14:05:12 +09:00
Dan Balasescu
17c58678cf
Update SelectionInfo.cs 2017-12-18 13:59:46 +09:00
Dan Balasescu
35b6114d01
Merge branch 'master' into editor-selection-tool 2017-12-18 13:57:32 +09:00
Dan Balasescu
57e5b2debe
Merge branch 'master' into add-deselect-mods-button 2017-12-18 13:48:35 +09:00
Dean Herbert
6121cd3b67 Remove animating skipping and reorder file a bit 2017-12-18 12:30:39 +09:00
Dean Herbert
23e014b52d Simplify drawable removal logic 2017-12-18 12:05:49 +09:00
Dean Herbert
b2cd32eb95 Move children to CarouselGroup 2017-12-18 11:57:13 +09:00
Dean Herbert
7173829896 Add filter checks to difficulty selection 2017-12-18 11:43:10 +09:00
Dean Herbert
4c1f00567b Fix incorrect flush logic when starting play from non-selected difficulty using context menu 2017-12-18 11:31:38 +09:00
Dean Herbert
4e46565f6e Remove todo 2017-12-18 11:25:02 +09:00
Dean Herbert
5bfb6d1f58 Remove unused variable 2017-12-18 11:13:51 +09:00
Dean Herbert
b21c22085d Make more things private 2017-12-18 11:13:16 +09:00
Dean Herbert
954bc77a71 Indicate unused variable 2017-12-18 08:05:57 +09:00
Dean Herbert
dfd7787b15 Move more overhead from ctor to BDL 2017-12-18 07:58:48 +09:00
Dean Herbert
c10288541c Avoid redundant IndexOf calls 2017-12-18 07:58:34 +09:00
Dean Herbert
482941b333 Preload drawables to force asynchronous construction 2017-12-18 06:59:32 +09:00
Dean Herbert
30a15729ec Fix event handling from outside carousel being scheduled at the wrong level
Was causing BeatmapSet's Set to run *after* newer events were received.
2017-12-18 02:46:53 +09:00
Dean Herbert
942054a30f Re-fix null selection 2017-12-18 02:26:40 +09:00
Dean Herbert
19643ba5e6 Resolve scroll animation/position issues 2017-12-18 02:23:03 +09:00
Dean Herbert
54cc6fadf9 Greatly improve performance when many hidden panels are on-screen 2017-12-17 05:57:50 +09:00
Dean Herbert
5d7413f19c Improve performance with large numbers of panels visible 2017-12-17 04:30:56 +09:00
Dean Herbert
c02ce16f47 Remove unnecessary capture 2017-12-17 03:04:57 +09:00
Dean Herbert
d27047f94d Remove logging 2017-12-17 03:04:37 +09:00
Dean Herbert
e2710a309c Fix panel animation and depth 2017-12-17 02:43:24 +09:00
Aergwyn
5fbe7dfd8c added Deselect All button to ModSelectOverlay 2017-12-16 17:53:22 +01:00
Dean Herbert
29a8ade59f Rename "Hidden" to "Collapsed" 2017-12-16 23:56:14 +09:00
Dean Herbert
da0940ae0b Only apply criteria if there are items populated in the carousel 2017-12-16 23:55:55 +09:00
Dean Herbert
33f8c8419a Fix initial beatmap selection potentially being incorrect 2017-12-16 21:25:54 +09:00
Ninjaprawn
84ed91d5c9 Remove IgnoreTooltip; Override TooltipText to null 2017-12-16 20:17:20 +11:00
Ninjaprawn
71e59bc9e7 Removed the IgnoreTooltip property 2017-12-16 20:16:40 +11:00
Dean Herbert
bd9056c709 Better choose new selection when multiple items are removed including current 2017-12-16 17:32:21 +09:00
Dean Herbert
59dbca2612 Fix ScrollToSelected being called in too many cases 2017-12-16 16:44:42 +09:00
Dean Herbert
df7e795aa3 Simplify and rename filter methods 2017-12-16 16:27:39 +09:00
Dean Herbert
3c406662ed Ensure correct selection after deletion of currently selected
Also fixes a lot of bad interactions and simplifies further.
2017-12-16 16:18:44 +09:00
Dean Herbert
49ce42d90c Add ToString() overrides on many classes to make debugging easier 2017-12-16 16:14:01 +09:00
Aergwyn
2e196661bb Merge branch 'master' into add-confirmation-dialog 2017-12-15 18:11:13 +01:00
Dean Herbert
a8a2c233a0 Add tests for (and fix) removal of last item in carousel 2017-12-16 00:33:09 +09:00
Dean Herbert
fd9d900ae0 Simplify StarCounter and SpriteIcon 2017-12-15 18:40:03 +09:00
Dean Herbert
acfdd32783 Move DrawableCarouselBeatmap initialisation to BDL
oops
2017-12-15 18:38:09 +09:00
smoogipoo
66b19b6c97 Expose selected objects from SelectionLayer 2017-12-15 14:48:24 +09:00
Dean Herbert
59d512762e SongSelect tidying 2017-12-15 14:44:14 +09:00
Dean Herbert
ed5b6cc16f Add back ctrl-enter autoplay shortcut 2017-12-15 14:44:13 +09:00
Dean Herbert
192ceb5465 Avoid multiple access to selectedBeatmap during y position computation 2017-12-15 14:44:12 +09:00
Dean Herbert
2e3332e3fe Shortcut non-visible panels to avoid adding as drawables 2017-12-15 14:44:12 +09:00
Dean Herbert
48e53a76b0 Fix incorrect line endings 2017-12-15 14:44:11 +09:00
Dean Herbert
67f05977ea Add sorting support 2017-12-15 14:36:51 +09:00
Dean Herbert
b4b2f12116 Add support for adding/removing items
Tests accompany of course
2017-12-15 14:36:51 +09:00
Dean Herbert
7814b2df14 More renaming 2017-12-15 14:36:51 +09:00
Dean Herbert
5cbb9b9b18 Fix random and add tests
Also exposes SelectedBeatmapSet.
2017-12-15 14:36:51 +09:00
Dean Herbert
8646d5d1e0 Add testing and fix filtering only some difficulties 2017-12-15 14:36:51 +09:00
Dean Herbert
ec4f99c92e Clean up tests some more 2017-12-15 14:36:51 +09:00
Dean Herbert
1b85952441 Cleanup and basic TestCase 2017-12-15 14:36:51 +09:00
Dean Herbert
b9298325a3 Rename weird config setting 2017-12-15 14:36:51 +09:00
Dean Herbert
1146ba02d7 Make GetWorkingBeatmap return a sane default rather than exception on lookup failure 2017-12-15 14:36:51 +09:00
Dean Herbert
99b00143eb More clean-ups and event bindings 2017-12-15 14:36:51 +09:00
Dean Herbert
78dd975a35 Initial carousel infrastructue changes 2017-12-15 14:36:51 +09:00
smoogipoo
2c1a83f82e Merge branch 'master' into editor-selection-tool 2017-12-15 13:36:47 +09:00
smoogipoo
33654ee5b4 Remove explicit padding on icon 2017-12-15 13:01:06 +09:00
Aergwyn
f329b1ed72 add Spinner Count to BeatmapInfoWedge
- added Tooltips to the respective InfoLabels
- made the TestCase internal like all others
2017-12-14 19:55:15 +01:00
Aergwyn
59e8536ff7 moved action to construction arguments 2017-12-14 17:33:56 +01:00
smoogipoo
b28b86dea9 Use Lazy for threadsafety on playfield 2017-12-14 20:27:51 +09:00
smoogipoo
9c59db4be3 Merge remote-tracking branch 'origin/master' into editor-selection-tool 2017-12-14 14:20:49 +09:00
Aergwyn
9fed972678 removed unnecessary using 2017-12-12 11:15:34 +01:00
Aergwyn
d11bf379d8 no longer select beatmapsets on import/download
let's save some ears and eyes for now
2017-12-12 11:04:11 +01:00
Dean Herbert
69653c7f4f Don't use nested ternary if 2017-12-12 13:07:34 +09:00
Dan Balasescu
186d347aae
Merge branch 'master' into editor-selection-tool 2017-12-11 22:24:12 +09:00
smoogipoo
3d51301e03 Add license headers 2017-12-11 22:21:33 +09:00
smoogipoo
666dcdbd62 Give HitObjectComposer a SelectionLayer 2017-12-11 22:20:02 +09:00
smoogipoo
a303bf71cf Give control over screen space conversion to DrawableHitObject 2017-12-11 22:19:02 +09:00
smoogipoo
2f1063c5c0 Refactor into separate files + add xmldocs + rename some methods 2017-12-11 21:56:58 +09:00
FreezyLemon
d0b7c92b46 Removed unnecessary usings. 2017-12-11 13:46:23 +01:00
FreezyLemon
bfa9beb7b2 Switched to regex to handle most of the decision on what to do on click. Also updated the getIdFromUrl method to adapt to the changes 2017-12-11 13:43:47 +01:00
Dean Herbert
8dea999908 Order difficulty icons by ruleset 2017-12-11 21:35:47 +09:00
Dean Herbert
b10240d7ef Handle the case where the selected panel is no longer a valid selection better 2017-12-11 21:31:26 +09:00
smoogipoo
c12c241633 Implement hover colours 2017-12-11 21:27:19 +09:00
Dean Herbert
fb92b3551e Correct panel y positions when filtered panels are present 2017-12-11 21:12:06 +09:00
smoogipoo
25d80a36be Finish up logical implementation of markers 2017-12-11 21:03:34 +09:00
Dean Herbert
970e55fc4a Update difficulty icons on headers to match filtered difficulties 2017-12-11 20:49:27 +09:00
FreezyLemon
8a02507d44 Let regex handle "getIdFromUrl" 2017-12-11 12:40:37 +01:00
Dean Herbert
f58c554d19 Add per-difficulty filtering support
Filters based on selected ruleset
2017-12-11 20:22:10 +09:00
FreezyLemon
63698895a5 Removed unnecessary container and fixed "HandleInput" for ChatLinks 2017-12-11 11:40:04 +01:00
FreezyLemon
bb0a32b555 Removed private OsuHoverContainer "content" from OsuLinkSpriteText for more customization. 2017-12-11 11:28:16 +01:00
smoogipoo
5147b342dc More refactorings + add markers
Move
2017-12-11 19:07:40 +09:00
FreezyLemon
4d475f1c1b Changed it so ChatLinks handle hover and click sounds themselves 2017-12-11 11:05:32 +01:00
FreezyLemon
13bc50ad56 Removed ICanDisableHoverSounds interface 2017-12-11 10:42:36 +01:00
FreezyLemon
2568ac1bf7 Fixed small merging mistake 2017-12-11 10:42:05 +01:00
Unknown
47bd97363e Use ShortName for mode.
- Also set the ruleset when fetching scores in BeatmapSetOverlay
2017-12-11 15:05:12 +05:30
smoogipoo
b28306d3c0 Fix incorrect SelectionPoint 2017-12-11 18:08:16 +09:00
smoogipoo
4573cc3322 Refactor into a new DragBox class, representing a single drag 2017-12-11 17:45:03 +09:00
naoey
ccbbd09d84 Merge remote-tracking branch 'upstream/master' into leaderboard-scopes 2017-12-11 13:59:22 +05:30
FreezyLemon
f8bc52bbe6 Merged https://github.com/ppy/osu master branch 2017-12-11 09:27:54 +01:00
smoogipoo
7189446943 Merge remote-tracking branch 'origin/master' into editor-selection-tool 2017-12-11 16:34:27 +09:00
Dean Herbert
3880c7157b
Merge branch 'master' into fix-missing-metadata 2017-12-11 16:04:08 +09:00
Dean Herbert
08727266e7
Merge branch 'master' into add-ruleset-shortname 2017-12-11 15:41:11 +09:00
Dean Herbert
04715f9a51
Merge branch 'master' into HandleInput 2017-12-11 15:24:29 +09:00
smoogipoo
ed81ed7c54 Add back HandleInput disable overrides 2017-12-11 15:19:00 +09:00
Dean Herbert
5a6ac73fff
Fix broken tools making broken changes 2017-12-11 15:05:19 +09:00
Dean Herbert
77592ed15f
Fix comment formatting 2017-12-11 14:52:15 +09:00
Dean Herbert
de1f51269d Merge branch 'master' into HandleInput 2017-12-11 13:53:33 +09:00
Dean Herbert
c880386fde
Merge branch 'master' into fix-crash-hidden-sets#2 2017-12-11 13:16:30 +09:00
Dean Herbert
7d8fb12332 DrawableScore -> DrawableProfileScore
Discern between the other class of the same name
2017-12-11 12:51:02 +09:00
Dean Herbert
0c2158ccbd Improve display of beatmap thumbnails 2017-12-11 12:47:31 +09:00
Dean Herbert
98ce856de1 Use more sensible names for classes and methods
Adds xmldoc in places too.
2017-12-11 12:33:34 +09:00
Dean Herbert
507d0e3252 Use more sensible names for classes 2017-12-11 12:26:48 +09:00
Dean Herbert
9069f1ccba
Merge branch 'master' into most-played-beatmaps-section 2017-12-11 12:12:23 +09:00
Aergwyn
e629cebe31 fix MusicController ignoring Looping property of a Track
my fix to prevent the MusicController from constantly trying to restart a track before accidentally removed this
2017-12-10 13:22:46 +01:00
FreezyLemon
8cbd6f32cb Moved menu music hash property back to intro and changed check (before undeleting) to "Protected" field. 2017-12-10 11:31:37 +01:00
FreezyLemon
1691a74b14 Merge branch 'undelete-button-add' of https://github.com/freezylemon/osu into undelete-button-add 2017-12-10 11:26:31 +01:00
Aergwyn
e4628427cb moved query into schedule 2017-12-10 08:15:29 +01:00
Dean Herbert
1417dfd67a
Merge branch 'master' into fix-crash-hidden-sets#2 2017-12-10 13:28:46 +09:00
Dean Herbert
6b63452a23
Merge branch 'master' into add-testing-tag 2017-12-10 13:09:09 +09:00
Dean Herbert
668299ef84
Merge branch 'master' into fix-userprofile-unranked 2017-12-10 13:02:32 +09:00
Dean Herbert
d02e1ae896 Update RulesetInfo and add migration 2017-12-10 12:15:55 +09:00
TocoToucan
219bdbc4e1 Populate HandleInput automatically 2017-12-09 22:21:17 +03:00
Aergwyn
cdf9ea0d01 removed unnecessary variable
and fixed the test because of new DI letting it fail
2017-12-09 13:39:11 +01:00
Aergwyn
821154d3bb reverted Beatmaps-setter back to its former glory 2017-12-09 08:42:59 +01:00
Dean Herbert
16b8c9bd11
Merge branch 'master' into fix-crash-hidden-sets#2 2017-12-09 11:51:47 +09:00
ColdVolcano
1f762dc6d8 Fix PreviewBar receiving a NaN Width value 2017-12-08 15:46:09 -06:00
Aergwyn
114604a642 removed unused DI 2017-12-08 14:45:40 +01:00
Aergwyn
c97646bea6 added confirmation dialog for Delete ALL beatmaps 2017-12-08 14:27:07 +01:00
Dean Herbert
c1989dbafe Merge branch 'master' into direct-relevance-sorting 2017-12-08 22:15:57 +09:00
Dean Herbert
4160c10921
Merge branch 'master' into direct-relevance-sorting 2017-12-08 21:18:18 +09:00
Dean Herbert
40652d2e74
Merge branch 'master' into fix-importing-some-beatmaps 2017-12-08 21:18:01 +09:00
Aergwyn
dde7678095 select beatmap on import/download 2017-12-08 13:09:30 +01:00
FreezyLemon
856b56d79c Fixed small typo. 2017-12-08 12:54:36 +01:00
FreezyLemon
e1c04a1f44 Added check for "menu music beatmap hash" before undeleting so circles.osu doesn't get imported on Undelete. Also moved the const property to BeatmapManager. 2017-12-08 12:50:04 +01:00
Aergwyn
3e417d8e30 removed specific AddBeatmap method
the way UpdateBeatmapSet was extended it can handle all of this and better
2017-12-08 12:47:28 +01:00
FreezyLemon
b1270a84f8 Added handling for rank == 0 (unranked), removed "#0" from country name if that happens, also display "no rank" when hovering over history instead of "#0" 2017-12-08 11:31:32 +01:00
FreezyLemon
4a723f7382 Added the "Service Include" tag that is used by Visual Studio's test explorer to the .csproj files 2017-12-08 11:05:00 +01:00
Dean Herbert
679134c030 Add ShortName to rulesets 2017-12-08 18:55:25 +09:00
Dean Herbert
51dc66df12 Add support for relevance based search results in osu!direct 2017-12-08 18:48:36 +09:00
FreezyLemon
d93a1fdaae Merge branch 'master' of https://github.com/ppy/osu into undelete-button-add 2017-12-08 10:30:42 +01:00
FreezyLemon
4b3cf0773d Various CI adjustments 2017-12-08 09:52:58 +01:00
smoogipoo
5341e79102 Remove SelectionDragger for now 2017-12-08 17:51:15 +09:00
FreezyLemon
61a6a2919e Fixed multiple critical bugs and changed allSamples to a normal Dictionary for faster access 2017-12-08 09:41:13 +01:00
smoogipoo
faa921ba05 Fix up post-merge issues 2017-12-08 17:41:10 +09:00
FreezyLemon
9e3d439f0a Merge branch 'master' of https://github.com/ppy/osu into taiko-hitsounds-fix 2017-12-08 08:30:02 +01:00
Dean Herbert
31884a951a Remove "redundant" parenthesis 2017-12-08 15:53:59 +09:00
smoogipoo
f41af191ed Merge remote-tracking branch 'origin/master' into editor-selection-tool 2017-12-08 15:13:18 +09:00
Dean Herbert
2e1dfa16a2 Fix checks disallowing import of older beatmaps with no embedded online IDs 2017-12-08 14:59:32 +09:00
Ninjaprawn
a491710fe4 Override IgnoreTooltip in DisplayableModIcon 2017-12-08 14:10:23 +11:00
Ninjaprawn
9b3e666a07 Added IgnoreTooltip to all classes required 2017-12-08 14:10:23 +11:00
Ninjaprawn
f5bea077a0 Subclass ModIcon to remove the tooltip text 2017-12-08 11:26:34 +11:00
FreezyLemon
d2f3d5a807 Added basic SampleInfo.FromSoundPoint and GetChannel methods 2017-12-07 23:09:51 +01:00
Aergwyn
105d01d85b fix crash when restoring from any non-SongSelect-screen
removed unwanted refresh
2017-12-07 22:02:53 +01:00
FreezyLemon
43c270ea49 Rolled back the bad earlier implementation 2017-12-07 21:18:51 +01:00
FreezyLemon
5546b8c316 Trimmed whitespace (CI) 2017-12-07 19:55:29 +01:00
FreezyLemon
68255095a6 Renamed the IHasHoverSounds interface to ICanDisableHoverSounds and made it so that if the interface is not implemented, it is just ignored (samples will always be played). If it is implemented, the ShouldPlayHoverSound bool is decisive of whether sounds are played or not 2017-12-07 19:52:40 +01:00
FreezyLemon
c5a7f5b163 Renamed the static variables and made them readonly, aswell as other small adjustments (CI) 2017-12-07 19:39:39 +01:00
FreezyLemon
34a37935e3 Removed unused property and unnecessary return statement (CI) 2017-12-07 19:38:59 +01:00
FreezyLemon
908553ffaf Added parameter for LoadMultiplayerLobby (CI warning for unused int) 2017-12-07 19:38:03 +01:00
FreezyLemon
e05618a415 Removed unnecessary "using" directives 2017-12-07 19:36:56 +01:00
FreezyLemon
6b0b518fd2 *ahem* REVERTED the changes to GetUserRequest because they're not needed (yet) 2017-12-07 16:58:16 +01:00
FreezyLemon
ce9b003e9a Reverted GetUserRequest because spectating is not implemented yet, and thus the additions are not needed (yet) 2017-12-07 16:52:43 +01:00
FreezyLemon
772bba27be Small style changes 2017-12-07 16:41:46 +01:00
FreezyLemon
2ceb073b5d Renamed OnClick to OnLinkClicked to (what should be) obvious reasons 2017-12-07 16:30:15 +01:00
FreezyLemon
d90eb2cdce Moved "Does this channel exist" check to ChatLine so that if a #name does not exist as a channel, it does not get added as a link (and does not contain a URL or anything else to prevent jankiness) 2017-12-07 16:26:28 +01:00
FreezyLemon
18eabd35f6 Set an empty list as default for AvailableChannels (mostly so that tests don't break, but also so that if no connection exists, the links don't break) 2017-12-07 16:25:30 +01:00
FreezyLemon
2129d6cede Renamed the "on click" method to OnClick() and moved most of the implementation to ChatLink.
Also fixed the tooltip text up
2017-12-07 16:23:43 +01:00
Aergwyn
95955d68ef rephrased description of local context checking 2017-12-07 14:14:50 +01:00
FreezyLemon
ca40db2b97 Fixed a bug where the hover wouldn't work correctly due to OsuLinkSpriteText assigning Action to a private property. 2017-12-07 13:57:29 +01:00
Aergwyn
1dcbfab18e removed redundant comment 2017-12-07 13:56:37 +01:00
FreezyLemon
5ded6e877c Added some tooltip text handling.
Also fixed a bug caused by SameLinkSprites where "this" is actually supposed to be included by just adding a manual function call.
2017-12-07 13:49:44 +01:00
Aergwyn
76c09ae59e added comments for local context checking 2017-12-07 13:44:47 +01:00
FreezyLemon
8ba66015f4 Implemented the new IHasHoverSounds interface in a private "ChatHoverContainer" class which is now used for ChatLink instances.
Also moved the overhead for finding all sprites in the same line that reference the same URL to the LoadComplete (used to be every hover, now only once).
2017-12-07 13:17:40 +01:00
FreezyLemon
a8599a1b75 Implemented new interface which allows parent containers to decide on whether a "OnHover" sound should be played. 2017-12-07 13:12:36 +01:00
Dan Balasescu
9e37a122e1
Merge branch 'master' into fix-sensitivityslider 2017-12-07 21:01:53 +09:00
smoogipoo
d52b84df46 Move KeyboardStep assignment to ctor 2017-12-07 20:53:28 +09:00
smoogipoo
46cd6fdb45 Merge remote-tracking branch 'origin/master' into fix-sensitivityslider 2017-12-07 20:49:48 +09:00
Dean Herbert
24b3b10942 Move drawable assignment to load, remove depth overrides 2017-12-07 20:44:55 +09:00
Dean Herbert
8c89354b36 Remove extra whitespace 2017-12-07 20:44:38 +09:00
Dean Herbert
d36982b1d9
Merge branch 'master' into header-button-should-derive 2017-12-07 20:04:41 +09:00
Dean Herbert
f2eef6621a
Merge branch 'master' into fix-missing-metadata 2017-12-07 19:23:51 +09:00
FreezyLemon
f4f1291919 Removed "wiki:" prefix from wiki links (links are visible on tooltips so this is unnecessary now) 2017-12-07 11:23:31 +01:00
FreezyLemon
8a88040ef5 Added tooltip to links 2017-12-07 11:12:21 +01:00
FreezyLemon
bd11124e6d Removed unnecessary copy (pass-by-reference anyways) 2017-12-07 11:12:12 +01:00
FreezyLemon
1b971c01e6 Fixed a bug where links would be out of order in their List which would cause the game to crash 2017-12-07 10:31:44 +01:00
FreezyLemon
ec8b5c2465 Permitted nulls in ChatOverlay.load() so that in testing, no "OsuGame" instance is required. Also added null checks to the links' on click actions 2017-12-07 10:31:02 +01:00
FreezyLemon
541c25e995 Renamed ChatLinkSpriteText to ChatLink for convenience 2017-12-07 10:28:12 +01:00
FreezyLemon
7bf25bdd4d Changed it so the ":" character does not appear after usernames when the displayed message is an action (e.g. /np). Just makes more sense imo 2017-12-07 10:23:57 +01:00
Dean Herbert
c35c8263b9 Merge remote-tracking branch 'upstream/master' into input-revamp 2017-12-07 18:07:26 +09:00
Dean Herbert
2a1a9b9f1f Fix post-merge issue 2017-12-07 17:26:39 +09:00
smoogipoo
bdf283a4e1 A bit more cleanup 2017-12-07 15:55:38 +09:00
smoogipoo
09f54b06ac Just don't serialize Author altogether for now 2017-12-07 15:55:22 +09:00
smoogipoo
0ba8988580 Don't serialize Author + add SerializableAttributes 2017-12-07 15:32:39 +09:00
Dean Herbert
44ee11e75f
Merge branch 'master' into fix-beatmap-carousel-lag 2017-12-07 15:30:50 +09:00
smoogipoo
e573db04d4 Don't serialize HitObject.Kiai 2017-12-07 14:42:36 +09:00
smoogipoo
f5f7658e90 Don't serialize TotalBreakTime 2017-12-07 14:40:28 +09:00
smoogipoo
245b5f759f Underscore + lowercase all keys 2017-12-07 14:37:12 +09:00
Dean Herbert
a78441bc5a Apply changes in line with framework input adjustments 2017-12-07 13:16:59 +09:00
smoogipoo
dfc10d42e8 Merge remote-tracking branch 'origin/master' into beatmap-serialization 2017-12-07 12:49:27 +09:00
smoogipoo
d026587a91 Add flag to explicitly serialize the type version 2017-12-07 12:49:16 +09:00
smoogipoo
9e51480aa3 Cleanup TypedListConverter a bit 2017-12-07 12:27:30 +09:00
smoogipoo
f1dbcc4f1a Remove misleading comments 2017-12-07 12:23:53 +09:00
smoogipoo
feef4b1890 Add license header 2017-12-07 12:18:00 +09:00
smoogipoo
fcfdbc8e07 Don't show the migrate button on deployed builds for now 2017-12-07 12:02:48 +09:00
smoogipoo
851c20aff0 Add a few comments 2017-12-07 11:17:32 +09:00
smoogipoo
ea2c67ca5f Fix incorrect serialization condition 2017-12-07 11:10:46 +09:00
smoogipoo
9597f9d46b Resharper cleanup 2017-12-07 11:10:20 +09:00
smoogipoo
0e3b001b13 Make maps with storyboards decode correctly with OsuJsonDecoder 2017-12-07 10:37:51 +09:00
Dan Balasescu
9c4ca46786
Merge branch 'master' into shader-precompile 2017-12-07 04:15:24 +09:00
smoogipoo
a8db3a9484 Add progress notification to migration 2017-12-07 04:09:03 +09:00
smoogipoo
41b607c165 Dont serialize hitobject sample properties copied from the control point 2017-12-07 03:40:43 +09:00
smoogipoo
9787788081 Revert unintended change 2017-12-07 03:39:43 +09:00
smoogipoo
4232a54b32 Make TypedListConverter not reconstruct serializers 2017-12-07 03:04:56 +09:00
smoogipoo
b6b26cfe25 Add basic method to migrate beatmaps to the new JSON format 2017-12-07 03:04:36 +09:00
FreezyLemon
94eb853d3d Added centralised handling for some chat links 2017-12-06 16:41:57 +01:00
Dan Balasescu
8e3cce798d
Merge branch 'master' into fix-async-is-loaded 2017-12-06 23:01:38 +09:00
Dean Herbert
34596b3368 Rename and comment for clarification 2017-12-06 21:47:48 +09:00
FreezyLemon
b04ddba2a0 Added basic "on click" actions to the in-chat links 2017-12-06 10:27:30 +01:00
smoogipoo
ed5f7e5353 Make OsuJsonDecoder apply defaults similar to OsuLegacyDecoder 2017-12-06 16:28:34 +09:00
smoogipoo
f9e34dfa3d Assume that control points are already sequentially-ordered
Fixes up deserializing.
2017-12-06 16:24:09 +09:00
Dean Herbert
04ae64e9fd Add missing IsCompleted check to ensureValid 2017-12-06 16:20:49 +09:00
smoogipoo
887b81148d Don't ignore RulesetId for now 2017-12-06 14:14:07 +09:00
smoogipoo
44edb8724f Add JsonIgnores to CommandTimelineGroup 2017-12-06 13:48:44 +09:00
Dean Herbert
15ed3b4aac Fix IsValueCreated method not cecking whether the async task was completed
Caused potential stutters for components that relied on this check.
2017-12-06 09:49:12 +09:00
smoogipoo
e199ee5225 Add a few xmldocs 2017-12-06 00:42:17 +09:00
smoogipoo
d2dc7c8937 Add OsuJsonDecoder 2017-12-06 00:38:12 +09:00
smoogipoo
b584178e85 Make Beatmap ISerializable and add more JsonIgnores 2017-12-06 00:37:37 +09:00
Dean Herbert
fb6408257a Add shader precompile step
Resolves  https://github.com/ppy/osu-framework/issues/1180 in a way.
2017-12-05 17:41:47 +09:00
Dean Herbert
c1b607fed9 Wait until track has restarted before continuing operation
I removed this from my previous PR thinking it was not required, but it turned out to be required after all. Just isn't so noticeable when it fails.
2017-12-05 14:06:40 +09:00
FreezyLemon
63a6a8b669 Fixed messages sent by yourself not being formatted 2017-12-04 19:31:48 +01:00
FreezyLemon
bb138ccaf7 Added licence header and removed unnecessary whitespace 2017-12-04 13:55:57 +01:00
FreezyLemon
9b866d2248 Made it so the link ID is always added before loading the SpriteTexts (fixed weird bug where some sprites would be white instead of blue). Also improved XML doc on TextColour 2017-12-04 13:46:07 +01:00
Dean Herbert
caee6c1cf1 Use Restart instead of Start 2017-12-04 21:40:26 +09:00
FreezyLemon
fd13bacf4a Made default link ID -1 (if no link is present) because linkId is currently being set to link.index which can be 0. 2017-12-04 13:34:16 +01:00
FreezyLemon
cf96323980 Added new OsuLinkSpriteText.TextColour property that sets the internal content (OsuHoverContainer)'s colour instead of the whole container, so that text colour is always changed through that (e.g. link colouring, link hover fade).
Implemented it to be used when adding text to an OsuLinkTextFlowContainer.
2017-12-04 13:33:42 +01:00
FreezyLemon
319f43e209 Added "getIdFromUrl" call back to content.action because performance impact is small and no unnecessary id calculations are done 2017-12-04 13:29:56 +01:00
Dean Herbert
a83add8540 Tidy up events 2017-12-04 20:30:56 +09:00
Aergwyn
12665fb8cf remove unnecessary declaration + revert accidental formatting 2017-12-04 12:11:28 +01:00
Aergwyn
011223048b fix crash if any amount of maps were restored from main menu
also fixes preview not playing if an entire set is restored
2017-12-04 11:47:27 +01:00
Dean Herbert
22656233d3
Merge branch 'master' into fix-playlist-audio-issue 2017-12-04 19:24:03 +09:00
Dean Herbert
d75db5046b
Merge branch 'master' into editor-composer 2017-12-04 12:41:40 +09:00
smoogipoo
5f9de399e4 Add keydown override 2017-12-04 11:30:25 +09:00
FreezyLemon
bf97f8b1b1 Added osu.ppy.sh/ss (screenshot) URL handling and calculate ID at assignment so it's not on click anymore 2017-12-03 23:55:34 +01:00
FreezyLemon
a839d0e91d LoadComponent before assigning URL to ensure dependency loading 2017-12-03 23:55:00 +01:00
FreezyLemon
3f336b8e61 Made the style a bit better, fixed a bug or two 2017-12-03 21:02:05 +01:00
FreezyLemon
2d270a1cfe Added ability to open other channels from chat links. 2017-12-03 20:45:30 +01:00
Aergwyn
14096c90cc removed looping if only one song is in the list (temporarily)
It had one problem in relation to SongSelect disabling it when left and in general that topic belongs to another PR.
2017-12-03 16:41:21 +01:00
Aergwyn
9d13bf3602 remove redundant expression 2017-12-03 14:35:23 +01:00
Aergwyn
dfa7448716 use ?: expression 2017-12-03 14:25:12 +01:00
Aergwyn
0c9ebcd58c fix possible NullRef 2017-12-03 14:15:08 +01:00
Aergwyn
a1dbd7916b fixes MusicController constantly trying to start a track
In Detail:
It tried to start a track if the current one ended even if no BeatmapSets were present.
Also if only one BeatmapSet is present if will loop by itself now.
2017-12-03 14:03:43 +01:00
FreezyLemon
c574cc4308 Removed unnecessary "using" statements 2017-12-03 11:16:34 +01:00
FreezyLemon
735dbddd17 Changed URL detection to be more reliable and generally work better 2017-12-03 06:52:57 +01:00
Dean Herbert
7957e55710
Merge branch 'master' into editor-composer 2017-12-03 14:47:07 +09:00
Aergwyn
ad8cd7eb5d fix possible NullReference?
AppVeyor pls?
2017-12-02 17:04:42 +01:00