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
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
Dean Herbert
6a5c6febc5
Add inline comment explaining the retry loop
2021-02-23 13:23:32 +09:00
Salman Ahmed
5493c55da7
Fix silly mistake
2021-02-22 16:59:35 +03:00
Salman Ahmed
5e9040c291
Use "pausing supported" conditional instead
2021-02-22 16:26:35 +03:00
Dean Herbert
8a97e2e28d
Update LocalisedString usages to RomanisedString
2021-02-22 19:01:42 +09:00
Dean Herbert
1fd76ea3fb
Apply changes to UI components overriding functions with changing signatures
2021-02-22 19:01:42 +09:00
Salman Ahmed
6bac83964a
Merge branch 'master' into fix-pofl-on-cooldown
2021-02-22 10:03:27 +03:00
smoogipoo
ccb83ef3a3
Fix checkbox not being updated
2021-02-22 15:47:47 +09:00
smoogipoo
8d463987dd
Fix being able to select incompatible freemods
2021-02-22 13:24:24 +09:00
Dan Balasescu
8037b101cb
Merge branch 'master' into perform-from-subscreen-support
2021-02-22 11:55:51 +09:00
Dean Herbert
38a2124921
Support instant exit if pausing is not allowed in the current game mode
2021-02-20 14:26:50 +09:00
Dan Balasescu
52372fe50d
Merge pull request #11713 from peppy/fix-error-exit-during-results-transition
...
Fix a potential crash when exiting play during the results screen transition
2021-02-19 18:39:21 +09:00
Dan Balasescu
9fc57b2145
Merge pull request #11832 from peppy/leaderboard-compact-mode
...
Show compact leaderboard during gameplay to reduce distractions
2021-02-19 18:17:46 +09:00
Dean Herbert
362e4802f7
Add the ability for PerformFromMenuRunner to inspect nested screen stacks
2021-02-19 17:58:04 +09:00
Salman Ahmed
0771154dd2
Make PauseCooldownActive protected and expose on test class
2021-02-19 11:42:30 +03:00
Salman Ahmed
ddd1dcff88
Attempt pausing every single frame
2021-02-19 11:33:26 +03:00
Dean Herbert
82cc06ca57
Fix new logic not considering fail overlay correctly
2021-02-19 17:26:54 +09:00
Dean Herbert
4c214b74ce
Merge branch 'master' into fix-error-exit-during-results-transition
2021-02-19 17:13:55 +09:00
Dean Herbert
b8c1e8ed7a
Merge pull request #11708 from frenzibyte/multiplayer-participant-rank
...
Display user global rank for multiplayer room participants
2021-02-19 16:57:30 +09:00
Dean Herbert
9d02f589fe
Compact leaderboard during gameplay
2021-02-19 16:51:39 +09:00
Salman Ahmed
4436585aa4
Keep attempting to pause gameplay while window not active
2021-02-19 10:46:32 +03:00
Salman Ahmed
772471a6d8
Add failing test case
2021-02-19 10:46:31 +03:00
Dean Herbert
691cfa5bc3
Add expanded/compact display modes for GameplayLeaderboard
2021-02-19 16:46:30 +09:00
Dean Herbert
ee9e6fff40
Add bindable flow for expanded leaderboard state
2021-02-19 15:09:41 +09:00
Dean Herbert
484968d797
Fix weird bool check
...
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2021-02-19 14:46:10 +09:00
Dean Herbert
4504023a23
Merge branch 'master' into playlists-freemod-support
2021-02-19 14:43:59 +09:00
Dean Herbert
39059ed82d
Remove unnecessary null coalesce check
2021-02-19 14:36:51 +09:00
Dean Herbert
df05c57f44
Merge branch 'master' into playlists-freemod-support
2021-02-19 14:35:20 +09:00
Dean Herbert
a2aec6bcdc
Merge pull request #11808 from smoogipoo/multiplayer-no-playlist-mangling
...
Rework multiplayer playlist handling to support multiple items
2021-02-19 14:33:53 +09:00
smoogipoo
bc10fcafae
Remove now unnecessary schedule
2021-02-19 13:23:51 +09:00
Dean Herbert
b68dbbceff
Merge branch 'master' into multiplayer-participant-rank
2021-02-19 13:16:44 +09:00
Dan Balasescu
6240d3964c
Merge pull request #11817 from peppy/fix-collection-dropdown-cross-thread-manipulation
...
Fix potential crash from cross-thread drawable manipulation in CollectionFilterDropdown
2021-02-19 10:06:42 +09:00
Salman Ahmed
e14a59f272
Fix creating ruleset instances per LINQ select
2021-02-18 15:26:59 +03:00
Dan Balasescu
46b67dd7bc
Merge pull request #11821 from peppy/fix-carousel-border-additive-alplha
...
Fix carousel items' borders getting blown out when selected and hovered
2021-02-18 17:45:58 +09:00
Dean Herbert
b713eb2eae
Make field readonly
2021-02-18 17:13:48 +09:00
Dean Herbert
c3a98b6ad1
Fix carousel items' borders getting blown out when selected and hovered
...
I tried restructuring the hierarchy to avoid needing this added property
(moving the hover layer out of the border container) but this leads to
some subpixel leakage outside the borders which looks even worse.
Closes #6915 .
2021-02-18 16:59:44 +09:00
smoogipoo
e911760318
Split OnlinePlayComposite to remove if-statement
2021-02-18 15:47:33 +09:00
Dean Herbert
421cdb6650
Consume new method in existing usages (and remove some unnecessary set/unset code)
2021-02-18 15:01:11 +09:00
Dean Herbert
49589b64c3
Intro track should not restart from preview point
2021-02-18 14:55:15 +09:00
Dean Herbert
90dce52042
Fix potential crash from cross-thread drawable manipulation in CollectionFilterDropdown
2021-02-18 14:10:28 +09:00
Dan Balasescu
e30fb72ee2
Merge pull request #11811 from peppy/fix-mod-display-thread-safety
...
Fix ModDisplay potentially being operated on before loaded completely
2021-02-18 00:05:31 +09:00
Dean Herbert
3208b2c5bf
Fix potential nullref if mods are never set
2021-02-17 23:13:51 +09:00
smoogipoo
6ef235c4c5
Fix beatmap panel flickering multiple times
2021-02-17 21:54:43 +09:00
smoogipoo
2a1bb2f578
Fix selected item potentially changing during gameplay
2021-02-17 21:40:21 +09:00
Dean Herbert
403536ef80
Fix ModDisplay potentially being operated on before loaded completely
...
Closes https://github.com/ppy/osu/issues/11810 .
2021-02-17 21:11:46 +09:00
Dean Herbert
9c298fac4a
Merge pull request #11801 from peppy/fix-import-always-importing
...
Fix intro beatmap always being imported even if already in a good state
2021-02-17 20:59:33 +09:00
smoogipoo
8930ff4465
Merge branch 'master' into multiplayer-no-playlist-mangling
2021-02-17 19:29:01 +09:00
Dean Herbert
c1620ce21b
Fix intro beatmap always being imported even if already in a good state
2021-02-17 19:19:49 +09:00
smoogipoo
604add04e4
Fix song select mods being reset incorrectly
2021-02-17 19:06:37 +09:00
smoogipoo
70a995919c
Update comments
2021-02-17 17:58:24 +09:00
Dan Balasescu
57ede6eb37
Merge branch 'master' into fix-multiplayer-mod-propagation-race
2021-02-17 16:22:51 +09:00
Dean Herbert
86faa7f465
Merge pull request #11798 from smoogipoo/multiplayer-long-types
...
Use long type where required in multiplayer
2021-02-17 15:50:12 +09:00
Salman Ahmed
a845e96b7a
Replace Ranks.Global completely with a GlobalRank property
2021-02-17 08:52:04 +03:00
Salman Ahmed
d7c91a7c6f
Merge branch 'fix-tournament-user-population' into multiplayer-participant-rank
2021-02-17 08:42:59 +03:00
Bartłomiej Dach
8f72631c31
Fix typo in comment
2021-02-16 21:48:19 +01:00
smoogipoo
100097d78f
Fix playlist not being handled correctly for non-joined cases
2021-02-16 21:32:35 +09:00
Dan Balasescu
bef0e5cfa1
Merge pull request #11790 from peppy/playlists-show-remaining-attempts
...
Display remaining attempts for playlist rooms with room-level attempt limits
2021-02-16 21:10:19 +09:00
Dan Balasescu
ffa90c1a23
Remove whitespace
2021-02-16 20:23:19 +09:00
Dan Balasescu
8e077c2857
Merge pull request #11791 from peppy/rooms-container-fix-click-deselection
...
Add the ability to deselect the currently selected room via clicking away
2021-02-16 20:22:24 +09:00
smoogipoo
379393fe10
Merge branch 'multiplayer-long-types' into multiplayer-no-playlist-mangling
2021-02-16 19:37:55 +09:00
smoogipoo
3e802531d3
Use long type where required in multiplayer
2021-02-16 19:34:01 +09:00
smoogipoo
e24a5949c5
Fix resolve
2021-02-16 19:26:51 +09:00
smoogipoo
2a1096a3c8
Make BeatmapSelectionControl use the selected item
2021-02-16 19:02:16 +09:00
smoogipoo
3ff9e14e35
Make StatefulMultiplayerClient control current playlist item
2021-02-16 18:56:13 +09:00
smoogipoo
855d24dce7
Cache selected item bindable from RoomSubScreen
2021-02-16 17:38:33 +09:00
smoogipoo
f25b5147ef
Select last playlist item in match subscreen
2021-02-16 15:37:45 +09:00
Dean Herbert
fdcb6384cb
Add user mod selection to playlists room screen
2021-02-16 15:14:56 +09:00
Dean Herbert
97a7572cb8
Move UserModSelectOverlay to RoomSubScreen for Playlists consumption
2021-02-16 15:14:48 +09:00
Dean Herbert
fff1cb0b35
Fix allowed mods not being copied when populating playlist items
2021-02-16 15:14:21 +09:00
Dean Herbert
da42c6d282
Expose FreeMods from OnlinePlaySongSelect
2021-02-16 15:14:21 +09:00
Dean Herbert
52e544aa67
Revert "Remove redundant double call to ValueChanged on UserMods change"
...
This reverts commit 9ed45ce1ca
2021-02-16 14:42:31 +09:00
Dean Herbert
9ed45ce1ca
Remove redundant double call to ValueChanged on UserMods change
2021-02-16 14:31:00 +09:00
Dean Herbert
0ca747b39f
Merge branch 'master' into fix-multiplayer-mod-propagation-race
2021-02-16 14:25:27 +09:00
Dean Herbert
31a5cdd8ac
Fix current selection not updating visually after creating a new playlist
2021-02-16 14:02:21 +09:00
Dean Herbert
e969ca8974
Remove unused using statement that rider could not identify
2021-02-16 13:52:42 +09:00
Dean Herbert
e82922f8c5
Add the ability to deselect the currently selected room via clicking away
...
Always felt wrong that you couldn't do this until now.
2021-02-16 13:44:37 +09:00
Salman Ahmed
0e7f52b5cc
Always use JSON property global_rank for global ranks instead
2021-02-16 07:33:16 +03:00
Salman Ahmed
5b4999e8af
Update user statistics retrieval with API changes
2021-02-16 07:33:13 +03:00
Dean Herbert
02417697e9
Display remaining attempts for playlist rooms with room-level attempt limits
2021-02-16 13:32:14 +09:00
Salman Ahmed
d15ffff9a5
Simplifiy user statistics retrieval to one-time on deserialization
2021-02-16 04:48:36 +03:00
Salman Ahmed
a1496cd8f3
Remove necessity of using CurrentModeRank as a fallback
2021-02-16 04:48:36 +03:00
Salman Ahmed
90aa6256d7
Merge branch 'master' into multiplayer-participant-rank
2021-02-16 04:44:57 +03:00
Dean Herbert
2e646882fa
Merge branch 'master' into non-concurrent-sample-playback
2021-02-15 21:22:21 +09:00
Dan Balasescu
6bfc7da671
Fix sample potentially playing at the wrong frequency
...
Co-authored-by: Dean Herbert <pe@ppy.sh>
2021-02-15 18:10:45 +09:00
Dean Herbert
de52b8a5ba
Fix test failures in PerformFromScreen tests
2021-02-15 17:14:41 +09:00
Dean Herbert
9cba350337
Refactor again to better cover cases where the pause dialog should definitely be shown
2021-02-15 15:57:36 +09:00
Dean Herbert
1aea840504
Add missing return in early exit scenario (MakeCurrent isn't compatible with the following Exit)
2021-02-15 15:03:12 +09:00
smoogipoo
c6ed3efa4a
Merge branch 'master' into non-concurrent-sample-playback
2021-02-15 14:47:32 +09:00
Dean Herbert
2b69c7b325
Fix incorrect order of operation in pause blocking logic
2021-02-15 14:24:08 +09:00
Joehu
b28a906197
Fix extra mod settings overflowing from screen
2021-02-12 10:29:29 -08:00
Joehu
52975c5185
Remove hardcoded padding from main content
2021-02-12 10:23:33 -08:00
smoogipoo
d3f0c0730d
Merge branch 'master' into non-concurrent-sample-playback
2021-02-12 17:22:15 +09:00
Dean Herbert
4ab16694d1
Fix classic "welcome" intro not looping as expected
2021-02-12 16:22:19 +09:00
Dan Balasescu
cb4d119f23
Merge pull request #11740 from peppy/editor-fix-slider-samples-new-placement
...
Fix newly placed sliders in the editor not playing hitsounds
2021-02-12 13:31:00 +09:00
Dean Herbert
cd01591dda
Consume new debounce logic in carousel header
2021-02-12 12:22:35 +09:00
Dean Herbert
e9730d4782
Move default sample addition to inside PlacementBlueprint
...
This isn't actually required to fix the behaviour but it does feel like
a better place to put this logic.
2021-02-11 17:16:18 +09:00
Dean Herbert
98c5b0220c
Merge pull request #11725 from smoogipoo/freemods-user-settings
...
Add local user customisation for freemod mod settings
2021-02-11 16:02:24 +09:00
Dean Herbert
889a99c49c
Use AddOnce everywhere to reduce potential call count
2021-02-11 16:00:52 +09:00
Dean Herbert
549e7520c5
Move scheduler logic to client callback rather than inside the update method
2021-02-11 16:00:52 +09:00
Dean Herbert
21f66a19fd
Make server authoritative in which mods the client should be using when gameplay starts
2021-02-11 15:55:18 +09:00
Dean Herbert
3344e9f27f
Merge pull request #11720 from nekodex/new-buttonsystem-edit-sound
...
Use unique sample for edit button click (ButtonSystem)
2021-02-11 15:10:35 +09:00
Dean Herbert
eaa7b4cb93
Rename second usage variable name to match
2021-02-11 14:54:50 +09:00
Dean Herbert
2afea88a25
Merge branch 'new-carousel-sounds' into update-resources
2021-02-11 14:20:20 +09:00
smoogipoo
86682cdb34
Add client/room null check
2021-02-10 20:16:26 +09:00
smoogipoo
6fff7c39da
Ensure tracker is disposed
2021-02-10 20:09:45 +09:00
smoogipoo
822c66033f
Add local-user freemod configuration
2021-02-10 19:56:59 +09:00
smoogipoo
393cd6c74a
Add helper class for tracking changes to mod settings
2021-02-10 19:40:07 +09:00
Jamie Taylor
996f1098f6
Use alternate sample on the downbeat while hovering OsuLogo
2021-02-10 18:17:48 +09:00
Jamie Taylor
bc7f4a4f88
Use a single sample for CarouselHeader on-hover with randomised pitch instead of multiple samples
2021-02-10 17:53:47 +09:00
Jamie Taylor
22995c216d
Use unique sample for edit button click (ButtonSystem)
2021-02-10 17:23:55 +09:00
Dan Balasescu
92599aa02b
Merge branch 'master' into user-beatmap-downloading-states-2
2021-02-09 21:06:09 +09:00
Dean Herbert
2c052d70e8
Only trigger pause cooldown on pause (not exit)
2021-02-09 17:29:18 +09:00
Dean Herbert
cba116ff09
Fix incorrect call parameter for quick exit
2021-02-09 17:28:57 +09:00
Dean Herbert
61b9539864
Fix regression in quick exit logic
2021-02-09 17:14:16 +09:00
Dean Herbert
5bd4f74ddf
Fix a potential crash when exiting play during the results screen transition
2021-02-09 16:24:29 +09:00
smoogipoo
3ce605b5e5
Small refactoring to use .Trim() instead
2021-02-09 12:00:03 +09:00
Salman Ahmed
d101add159
Display user global rank for selected ruleset in participants panel
2021-02-08 21:25:50 +03:00
Joehu
414e05affd
Fix editor effect attribute tooltip having unnecessary whitespace when only one is enabled
2021-02-08 10:16:16 -08:00
Dean Herbert
2cac373365
Merge pull request #11706 from smoogipoo/fix-failing-test
...
Fix failing test
2021-02-08 20:57:38 +09:00
Dean Herbert
0dd1b1026c
Merge pull request #11495 from smoogipoo/more-accurate-most-common-bpm
...
Make most common BPM more accurate
2021-02-08 20:08:58 +09:00
Dean Herbert
156f5bd5df
Add newline between statements
2021-02-08 20:05:16 +09:00
smoogipoo
19368f87fb
Fix failing test
2021-02-08 19:59:07 +09:00
Dan Balasescu
7bc6010d90
Merge pull request #11703 from Joehuu/fix-timing-editor-attribute-column
...
Fix attributes header not being aligned with content in editor timing mode
2021-02-08 19:38:59 +09:00
Dean Herbert
5fbed05d04
Merge pull request #11551 from smoogipoo/fix-leave-room-race-2
...
Fix client potentially not leaving a room on exiting multiplayer
2021-02-08 19:23:14 +09:00
smoogipoo
a08c51f213
Remove duplicate code
2021-02-08 19:23:10 +09:00
smoogipoo
6e34e7d750
Merge branch 'master' into user-beatmap-downloading-states-2
2021-02-08 19:08:53 +09:00
smoogipoo
69ca440ae5
Merge branch 'master' into more-accurate-most-common-bpm
2021-02-08 18:40:58 +09:00
Joehu
5e7823b289
Fix attributes content being zero size and disappearing after being half off-screen
2021-02-08 01:37:34 -08:00
Joehu
6b26a18a23
Fix attributes header not being aligned with content in editor timing mode
2021-02-08 01:34:32 -08:00
Dean Herbert
59dc148a48
Merge pull request #11680 from frenzibyte/instant-pause-on-focus-loss
...
Make pausing on window focus loss instantaneous
2021-02-08 17:00:17 +09:00
Dean Herbert
9e0724b138
Remove unnecessary double resolution of OsuGame
2021-02-08 15:58:41 +09:00
Dan Balasescu
e8f08b09dc
Merge pull request #11552 from vmaggioli/zero-spinner-slider
...
Fix being able to set zero or negative hitobject duration via timeline
2021-02-08 14:52:35 +09:00
Dean Herbert
93f1a3c1bf
Merge branch 'master' into instant-pause-on-focus-loss
2021-02-08 14:31:40 +09:00
Joehu
d74a1437be
Fix player loader metadata not being centred
2021-02-07 15:14:08 -08:00
Salman Ahmed
d0ca2b99a8
Remove unnecessary injected dependency
2021-02-06 20:57:01 +03:00
Salman Ahmed
40ddccf0c7
Do not consider replays for "pause on focus lost"
...
Replays are not pausable as can be seen in the `canPause` check.
2021-02-06 20:56:08 +03:00
Salman Ahmed
c9db0bf886
Call break time update when loaded
2021-02-06 20:54:13 +03:00
