Commit Graph

512 Commits

Author SHA1 Message Date
caa5109e3a Add precautionary null checks to update methods in SongSelect 2021-01-03 12:18:35 +09:00
df5e1d83bd Allow recommender to potentially be null 2020-12-22 14:36:52 +09:00
cbbcf36eaa Merge branch 'master' of https://github.com/ppy/osu into present-recommended 2020-12-03 19:38:32 +02:00
a852a27dfb Fix current beatmap temporarily becoming empty during ruleset change
When changing the ruleset at song select, there was a scenario where it
would be set to default (empty) for one debounce length where this was
not actually required. This occurs when the currently selected beatmap
set has other difficulties which match the target ruleset, specifically.
2020-11-30 19:36:30 +09:00
944f3480c2 Merge branch 'master' of https://github.com/ppy/osu into present-recommended
 Conflicts:
	osu.Game/OsuGameBase.cs
	osu.Game/Screens/Select/DifficultyRecommender.cs
	osu.Game/Screens/Select/SongSelect.cs
2020-11-21 14:01:01 +02:00
df9ff76f23 Reduce assert to guard in the outwards direction 2020-11-03 16:49:13 +09:00
d5c95a8b46 Centralise into methods and add assertions for safety 2020-11-03 00:45:55 +09:00
c3d3856a64 Fix looping mode not being set on first track after entering song select
Closes #10656.
2020-11-02 23:51:02 +09:00
6f623d8cca Rename IsUserPaused -> UserPauseRequested 2020-11-02 16:08:59 +09:00
8f2cd0e8c5 Add matching requestedByUser parameter to Play method 2020-11-02 15:01:30 +09:00
6cbff98295 Merge branch 'master' into add-collections-to-beatmap-options 2020-09-15 15:23:33 +09:00
2c7492d717 Add null check in SongSelect disposal for safety 2020-09-15 14:34:58 +09:00
43daabc982 Remove unused using and move dialog to BDL 2020-09-14 12:10:00 -07:00
c833f5fcc4 Reorder buttons to match stable 2020-09-14 11:23:41 -07:00
c30174cea3 Add manage collections button to beatmap options 2020-09-14 11:21:23 -07:00
1a8a7ae7f8 Remove hardcoded key param from AddButton 2020-09-14 11:19:18 -07:00
a377cccb4d Unsubscribe from track changed event on disposal 2020-09-14 17:10:35 +02:00
f17b2f1359 Ensure track is looping in song select immediately 2020-09-12 20:43:17 +02:00
b594a2a507 Import collections on initial import-from-stable step 2020-09-11 11:16:00 +09:00
7d35893ecd Make MusicController non-nullable 2020-08-11 12:40:58 +09:00
f058f5e977 Fix incorrect value being set 2020-08-06 16:24:14 +09:00
5c05fe3988 Expose track from MusicController 2020-08-06 16:24:14 +09:00
6e42b8219c Move track to MusicController, compiles 2020-08-06 16:24:14 +09:00
73e1bf0d89 Check sub screen's OnBackButton instead 2020-07-14 13:19:48 -07:00
36041fc245 Fix back button not working correctly with multi song select's mod select 2020-07-14 00:29:57 -07:00
4caf4d31d4 Fix mod select blocking home and alt f4 in song select 2020-07-14 00:00:10 -07:00
bbbe8d6f68 Remove group selector for now, tidy up code somewhat 2020-07-09 13:47:11 +09:00
a40475e6aa Remove triggerNextRandom from SongSelect 2020-06-04 21:09:47 +12:00
cb6e473910 Remove triggerPreviousRandom from SongSelect 2020-06-04 21:08:07 +12:00
cab132673a Break FooterButtonRandom creation into multiple lines 2020-06-04 21:03:10 +12:00
8533d7573d Rename FooterButtonRandom actions to better describe what they are used for 2020-06-04 21:00:29 +12:00
aa08847bc9 Set FooterButtonRandom actions properly when creating the button 2020-06-04 16:08:16 +12:00
93572fc17d Merge branch 'master' into present-recommended 2020-06-03 12:31:23 +09:00
0eae8d078b Merge branch 'master' into master 2020-05-05 13:33:29 +09:00
0e2ccac33b Add spaces to comments 2020-05-04 18:36:24 -07:00
06f58dd3e3 Ensure correct beatmap and ruleset when presenting a score from song select 2020-05-04 15:20:43 +09:00
33a608fd15 Merge branch 'master' of https://github.com/ppy/osu into present-recommended
 Conflicts:
	osu.Game/Screens/Select/SongSelect.cs
2020-05-01 11:06:20 +03:00
000c34dc26 Move recommender to field construction 2020-04-30 21:01:53 +09:00
cf4e79cf38 Show loading spinner when carousel is not ready to be displayed 2020-04-30 11:51:06 +09:00
119000f1ab Reduce database includes where possible 2020-04-28 21:43:35 +09:00
657bf5ad86 Merge branch 'master' of https://github.com/ppy/osu into present-recommended 2020-04-25 10:13:57 +03:00
3b3a7bdd85 Merge branch 'master' into scroll-to-center 2020-04-21 10:21:08 +09:00
ee1ccb8bcb Fix in a slightly different and hopefully more understandable way 2020-04-20 14:03:55 +09:00
b57d709d15 Don't use Parent 2020-04-19 18:29:06 +03:00
5833a7ac91 Fix presenting new ruleset and beatmap at once causing wedge display desync 2020-04-17 18:56:17 +09:00
91b13f91ea Add exception disallowing potential edit when disabled at a property level 2020-04-16 12:11:12 +09:00
e2b28bfe88 Hide edit context menu item in multiplayer song select 2020-04-15 18:17:12 -07:00
dd6c9173da Move DifficultyRecommender to OsuGameBase 2020-04-14 18:42:00 +03:00
abea7b5299 Tidy up function passing, naming, ordering etc. 2020-04-11 17:13:35 +09:00
a843793957 Un-nest class 2020-04-11 16:41:11 +09:00