Dean Herbert
9b5d11f2a5
Merge pull request #11958 from bdach/ruleset-filter-v3
...
Allow rulesets to specify custom song select filtering criteria
2021-03-08 23:23:24 +09:00
Dan Balasescu
ff2327ffac
Merge branch 'master' into configure-await-false
2021-03-08 22:24:29 +09:00
Dean Herbert
b1cd01ceb8
Apply ConfigureAwait changes to game side
2021-03-08 14:36:35 +09:00
Dean Herbert
765cc5cf37
Remove iOS multiplayer blocking code
2021-03-08 14:35:22 +09:00
Dean Herbert
f46880f68a
Merge branch 'master' into intro-triangles-background-access
2021-03-08 13:31:09 +09:00
Dean Herbert
74fc5d5b8c
Fix potential cross-thread drawable mutation in IntroTriangles
2021-03-08 13:30:07 +09:00
Dean Herbert
503f29609a
Also set additive mode to match stable
2021-03-07 23:40:09 +09:00
Joehu
3e4dfdb675
Fix pop out count being above displayed count on legacy combo counter
2021-03-06 20:37:27 -08:00
Bartłomiej Dach
12b7d9e06d
Simplify custom filter criteria retrieval
2021-03-06 12:16:01 +01:00
Bartłomiej Dach
f00089846b
Merge branch 'master' into ruleset-filter-v3
2021-03-06 12:14:53 +01:00
Bartłomiej Dach
f733d1ec1f
Expose and document query parser and helpers
2021-03-03 22:03:01 +01:00
Bartłomiej Dach
f9148eec20
Refactor filter query parsing helper methods
...
In preparation for exposition as public.
2021-03-03 21:34:14 +01:00
Dean Herbert
23a46819dc
Merge branch 'master' into multiplayer-confirm-on-exit
2021-03-03 20:35:31 +09:00
Dean Herbert
0f5bce70ad
Split confirmation dialog classes apart
2021-03-03 20:34:37 +09:00
smoogipoo
012b48dbe5
Remove explicit public definition
...
Interface members are public by default.
2021-03-03 19:03:45 +09:00
Dean Herbert
0ede28da2f
Fix test failures due to missing dependency
2021-03-03 15:24:55 +09:00
Dean Herbert
cb4c3503a0
Confirm exiting a multiplayer match
2021-03-03 14:54:18 +09:00
Dean Herbert
d332fd2414
Handle case where local user tries to change beatmap while not the host
2021-03-03 14:53:47 +09:00
Dean Herbert
7dce9b04fa
Add a more basic ConfirmDialog implementation
2021-03-03 14:50:45 +09:00
Dean Herbert
fcea900a53
Move main menu (song select) presentation logic to a local implementation
...
Reduces cross-dependencies between OsuGame and MainMenu.
2021-03-03 14:13:51 +09:00
Dean Herbert
36e1fb6da8
Add flow to allow MatchSubScreen to handle beatmap presentation locally
2021-03-03 14:13:51 +09:00
Dean Herbert
6e75ebbb06
Add interface to handle local beatmap presentation logic
2021-03-03 14:13:48 +09:00
Bartłomiej Dach
42c3309d49
Use ruleset criteria in parsing and filtering
2021-03-02 20:11:21 +01:00
Bartłomiej Dach
c375be6b07
Instantiate ruleset criteria
2021-03-02 20:10:03 +01:00
Bartłomiej Dach
e46543a4a9
Constrain operator parsing better
2021-03-02 19:56:36 +01:00
Bartłomiej Dach
26736d990f
Enable filter parsing extensibility
2021-03-02 19:42:47 +01:00
Dean Herbert
4fd8501c86
Remove unnecessary using (underlying enumerator change)
2021-02-26 20:03:03 +09:00
Dean Herbert
cd1c1bf534
Centralise cases of performing actions on the current selection
...
By moving this to a central location, we can avoid invoking the
EditorChangeHandler when there is no selection made. This helps
alleviate the issue pointed out in
https://github.com/ppy/osu/issues/11901 , but not fix it completely.
2021-02-26 14:15:13 +09:00
Bartłomiej Dach
d0decc73be
Merge branch 'master' into beatmap-difficulty-cache-nullable
2021-02-25 19:40:38 +01:00
Dean Herbert
a792c3f13c
Merge pull request #11900 from peppy/update-bpm-with-mods
...
Update the displayed BPM at song select with rate adjust mods
2021-02-26 00:25:55 +09:00
smoogipoo
01a4815412
Make labels disappear on null beatmap/no hitobjects
2021-02-25 23:36:02 +09:00
Dan Balasescu
46ea0f44eb
Merge branch 'master' into beatmap-difficulty-cache-nullable
2021-02-25 22:52:15 +09:00
smoogipoo
c1f27ba938
Merge branch 'master' into fix-song-select-star-rating-display-zero-flashing
2021-02-25 22:13:48 +09:00
smoogipoo
c3eb44137b
Move ValueChanged bind back to load()
2021-02-25 22:09:41 +09:00
smoogipoo
649ce20e35
Fix up super weird and super wrong DI
2021-02-25 22:01:53 +09:00
smoogipoo
b090a82b35
Merge branch 'master' into update-bpm-with-mods
2021-02-25 21:58:54 +09:00
smoogipoo
de417a660d
Make BPM update with changes in mod settings
2021-02-25 21:51:32 +09:00
smoogipoo
98313a98bf
DI mods in parent class and pass them down
2021-02-25 21:48:02 +09:00
Dean Herbert
90e8308716
Merge branch 'master' into localisation-refactor-framework
2021-02-25 17:28:55 +09:00
Dean Herbert
2db4b793d7
Also handle most common BPM display
2021-02-25 17:05:00 +09:00
Dean Herbert
31c52bd585
Update the displayed BPM at song select with rate adjust mods
...
This only covers constant rate rate adjust mods. Mods like wind up/wind
down will need a more complex implementation which we haven't really
planned yet.
2021-02-25 17:00:44 +09:00
Dean Herbert
03771ce8ec
Allow determining a BeatmapDifficultyCache's bindable return's completion state via nullability
2021-02-25 16:19:01 +09:00
Dean Herbert
9f3ceb99eb
Fix the star rating display at song select flashing to zero when changing mods
...
Due to the use of bindable flow provided by `BeatmapDifficultyCache` in
this usage, the display would briefly flash to zero while difficulty
calculation was still running (as there is no way for a consumer of the
provided bindable to know whether the returned 0 is an actual 0 SR or a
"pending" calculation).
While I hope to fix this by making the bindable flow return nullable
values, I think this particular use case works better with non-bindable
flow so have switched across to that.
2021-02-25 16:05:13 +09:00
Dean Herbert
e82eaffaed
Flip order back to original for romanisable strings
2021-02-25 14:14:07 +09:00
Dean Herbert
a362382d38
Add back more correct null checks
2021-02-25 14:06:21 +09:00
Dan Balasescu
a7d10630e0
Merge pull request #11893 from peppy/fix-request-queue-reference-holding
...
Fix requests being indefinitely queued when user is offline
2021-02-24 23:07:02 +09:00
Dean Herbert
fa6d797adf
Remove redundant prefix
2021-02-24 20:30:17 +09:00
Dean Herbert
5dc0aefb2b
Cancel request on leaving results screen
2021-02-24 19:54:52 +09:00
Dan Balasescu
c0f21c8cbe
Merge branch 'master' into fix-selecting-incompatible-freemods
2021-02-24 15:10:48 +09:00
Dan Balasescu
cfea4c7d4d
Merge pull request #11881 from peppy/disable-hub-connections-on-ios
...
Disable multiplayer/spectator on iOS until it can be supported again
2021-02-24 13:09:03 +09:00
