1
0
mirror of https://github.com/ppy/osu.git synced 2025-03-27 06:17:45 +08:00

23509 Commits

Author SHA1 Message Date
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
Dan Balasescu
8e12dd98f9
Merge pull request #11897 from peppy/fix-song-select-star-rating-display-zero-flashing
Fix the star rating display at song select flashing to zero when changing mods
2021-02-25 22:51:35 +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
8004652d27
Merge branch 'master' into optimised-has-flag-checks 2021-02-25 21:24:39 +09:00
Dean Herbert
3802cb29a4 Fix failing tests doing reference comparisons between string and LocalisedString 2021-02-25 17:49:54 +09:00
Dean Herbert
6d1c5979ea Update framework 2021-02-25 17:28:59 +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
5fa9bf61b6 Update xmldoc 2021-02-25 16:22:40 +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
smoogipoo
dff1d80f39 Update HasFlag usages to HasFlagFast 2021-02-25 15:38:56 +09:00
Dean Herbert
2c8e62ae35 Fix toolbar not completing enough of layout to propagate hotkeys to buttons before initial display 2021-02-25 14:52:51 +09:00
Dean Herbert
e82eaffaed Flip order back to original for romanisable strings 2021-02-25 14:14:07 +09:00
Dean Herbert
4cdde42228 Remove unnecessary backing field 2021-02-25 14:08:01 +09:00
Dean Herbert
a362382d38 Add back more correct null checks 2021-02-25 14:06:21 +09:00
Dean Herbert
67773c42ef
Merge pull request #11888 from H2n9/modtimeramp-new-behaviour 2021-02-25 14:01:57 +09:00
Bartłomiej Dach
421b7877d4 Avoid mixing precision across time ramp bindables
Bears no functional difference, it's just a bit less of an eyesore.
2021-02-24 19:16:10 +01:00
Ronnie Moir
73d6a3687e Change rate correction logic to be more explicit 2021-02-24 14:40:56 +00:00
Dan Balasescu
3e2b21a9b4
Merge pull request #11892 from peppy/allow-collection-name-collisions
Fix crash on two collections existing with the same name
2021-02-24 23:08:05 +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
9ed8d902f7 Fix requests being indefinitely queued when user is offline 2021-02-24 19:57:42 +09:00
Dean Herbert
5dc0aefb2b Cancel request on leaving results screen 2021-02-24 19:54:52 +09:00
Dean Herbert
0c202e0777
Merge branch 'master' into fix-selecting-incompatible-freemods 2021-02-24 19:24:04 +09:00
Dean Herbert
165da32044 Fix dropdown crash on collection name collisions 2021-02-24 18:41:42 +09:00
Dan Balasescu
c0f21c8cbe
Merge branch 'master' into fix-selecting-incompatible-freemods 2021-02-24 15:10:48 +09:00
smoogipoo
0b44d2483b Make some properties virtual
I think they were intended to be this way from the beginning.
2021-02-24 15:03:41 +09:00
smoogipoo
14160b897e Fix references to ModSuddenDeath 2021-02-24 14:44:53 +09:00
smoogipoo
30a58691f0 Make SD and PF incompatible with each other 2021-02-24 14:34:37 +09:00
Dan Balasescu
a229c3a0f4
Merge pull request #11882 from peppy/fix-import-collections-twice-crash
Fix importing collections twice from stable causing a hard crash
2021-02-24 14:31:54 +09:00
Dan Balasescu
de48b7c8c8
Merge branch 'master' into fix-import-collections-twice-crash 2021-02-24 13:25:31 +09:00
Dan Balasescu
90e515aadd
Merge branch 'master' into disable-all-mouse-buttons 2021-02-24 13:25:28 +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
Dean Herbert
e1f71038e3 Remove unncessary action 2021-02-24 12:13:55 +09:00
Dean Herbert
71182347d6 Also add a notifiation when trying to enter the multiplayer screen
Turns out the only check required to get into this screen was that the
API was online, which it always is even if the multiplayer component
isn't.

This provides a better end-user experience.
2021-02-24 11:30:14 +09:00
Ronnie Moir
f6d3cd6413 Change SamplePlaybackWithRateMods to use rate calulated from the sample
Replace hardcoded numbers
2021-02-23 21:25:59 +00:00
Bartłomiej Dach
6dc0cf5ea9
Merge branch 'master' into fix-import-collections-twice-crash 2021-02-23 22:14:25 +01:00
Ronnie Moir
7394c62cc8 Make ModTimeRamp and ModRateAdjust incompatible 2021-02-23 18:10:03 +00:00
Ronnie Moir
a6e840634b Adjust scrubbing behaviour to allow dragging through rate values 2021-02-23 15:52:53 +00:00
Ronnie Moir
f45cedeb85 Adjust initial and final rate ranges and prevent them from overlapping 2021-02-23 15:38:09 +00:00