Dan Balasescu
792ee3d171
Merge pull request #17802 from peppy/match-start-control-test-refactor
...
Refactor `TestSceneMatchStartControl` to avoid usage of `TestMultiplayerClient`
2022-04-15 13:28:21 +09:00
Salman Ahmed
da098d071f
Merge branch 'master' into settings-inactive-dim
2022-04-14 15:52:51 +03:00
Salman Ahmed
4b241874c3
Merge branch 'master' into hold-delay-keyword
2022-04-14 15:25:22 +03:00
Dean Herbert
03d0b4d951
Merge branch 'master' into settings-inactive-dim
2022-04-14 21:23:20 +09:00
Dean Herbert
b088959045
Reduce settings fade in duration to higher alpha/colour cross-talk
2022-04-14 21:17:06 +09:00
Dean Herbert
9240148c8e
Avoid initial fade of dim layer
2022-04-14 21:16:54 +09:00
Dean Herbert
f19208a245
Move dim layer to top and only apply dimming at one location
2022-04-14 21:04:52 +09:00
Salman Ahmed
59bb6b8f7c
Add background dim effect to inactive settings sections
2022-04-14 13:43:12 +03:00
Salman Ahmed
566a20a623
Add keyword "delay" to hold-to-confirm activation time setting
2022-04-14 13:27:12 +03:00
Dean Herbert
7582c2a5e8
Remove unnecessary bindable
2022-04-14 19:13:54 +09:00
Dean Herbert
bb4322a4c4
Fix UI scale being applied unevenly, causing elements to move around relative to each other
2022-04-14 19:04:31 +09:00
Dan Balasescu
2abdbe53e7
Cleanup whitespace
2022-04-14 18:55:12 +09:00
Dan Balasescu
9de4d416e2
Merge branch 'master' into fix-spectator-seeks
2022-04-14 18:54:52 +09:00
Dean Herbert
1fdf742d38
Fix potentially incorrect button being pressed during PopupDialog hide due to flag set too late
2022-04-14 17:51:50 +09:00
Dean Herbert
e010dfb150
Handle virtual track string to avoid throwing later in lookup
2022-04-14 17:33:42 +09:00
Dean Herbert
8b901fe60b
Fix potential null reference when running recursive findValidTarget
2022-04-14 16:23:55 +09:00
Dean Herbert
2bc4bb9e20
Consider SubScreenStacks when allowing for exit confirmation sequence in PerformFromMenuRunner
2022-04-14 16:19:34 +09:00
Dean Herbert
f9d9e6aa61
Ensure popup dialogs are hidden before running any associated actions
2022-04-14 16:19:34 +09:00
Dan Balasescu
9af81adea7
Merge pull request #17815 from peppy/hold-to-confirm-button-improvement
...
Adjust hold to confirm animation curve to better show intention
2022-04-14 15:03:08 +09:00
Dean Herbert
7160a48bab
Adjust hold to confirm animation curve to better show intention
2022-04-14 14:11:44 +09:00
Dan Balasescu
494955aff1
Resolve inspection issues
2022-04-14 13:11:11 +09:00
Dean Herbert
0a7fbcad1e
Merge branch 'master' into match-start-control-test-refactor
2022-04-13 22:26:10 +09:00
Dean Herbert
9b433280bd
Remove countdown implementation from TestMultiplayerClient
2022-04-13 21:24:33 +09:00
Dean Herbert
c0ad91796d
Fix gameplay start flow
2022-04-13 20:57:40 +09:00
Dean Herbert
2bb0d9e6d3
Expose required classes/properties for mocking
2022-04-13 17:02:33 +09:00
Dan Balasescu
3d27d3c536
Merge pull request #17786 from peppy/gameplay-leaderboard-update-totals-mode-change
...
Fix multiple issues with gameplay leaderboard (and tests)
2022-04-13 16:05:35 +09:00
Dan Balasescu
59ff9be316
Merge pull request #17788 from peppy/fix-replay-download-button-tests
...
Fix multiple issues in `ReplayDownloadButton` test scene
2022-04-13 16:00:45 +09:00
Dean Herbert
56427becbb
Move logging and early return into UndeleteForReuse method itself
2022-04-13 14:33:28 +09:00
Dean Herbert
fbf0e5a45c
Remove startFromSkipTarget parameter and update usages that required said behaviour
2022-04-13 14:25:43 +09:00
Dean Herbert
a59c6013c7
Rename latestGameplayStartTime to skipTargetTime
2022-04-13 14:03:52 +09:00
Dean Herbert
d4286255a0
Expose and set GameplayStartTime directly, rather than via Reset parameter
2022-04-13 13:58:44 +09:00
Dean Herbert
017f3852c8
Replace incorrectly chosen ??= with ??
2022-04-13 13:32:36 +09:00
Dean Herbert
9c68b3edc5
Merge branch 'master' into fix-spectator-seeks
2022-04-13 12:33:41 +09:00
Dean Herbert
282fccb4c8
Fix typo in xmldoc
...
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2022-04-13 12:24:47 +09:00
Dan Balasescu
567d755794
Merge pull request #17790 from huoyaoyuan/remove-binary-serialization
...
Remove usages of binary serialization
2022-04-13 11:00:23 +09:00
Huo Yaoyuan
80e312dbbc
Remove unused binary serialization related code.
2022-04-12 20:29:13 +08:00
Huo Yaoyuan
bf677ad0ac
Remove usages of BinaryFormatter.
2022-04-12 20:28:14 +08:00
Dean Herbert
20eca9bf6a
Refactor TestSceneRankRangePill to not depend on TestMultiplayerClient
2022-04-12 19:39:24 +09:00
Dean Herbert
6dbfc26158
Add log output when a model is undeleted
2022-04-12 18:23:38 +09:00
Dean Herbert
b51abfc722
Fix ScoreDownloadTracker matching on empty hash equality
2022-04-12 18:22:23 +09:00
Dean Herbert
e901857610
Merge pull request #17776 from frenzibyte/dangerous-dialog-button-bounds
...
Fix dialog dangerous button being clickable at edges
2022-04-12 15:40:50 +09:00
Dean Herbert
8b1cee75fa
Use BindableLong instead of BindableInt for user score tracking
2022-04-12 14:13:07 +09:00
Dan Balasescu
0e1d17d1d1
Use zh-Hant instead of zh-TW
2022-04-12 13:11:22 +09:00
Dean Herbert
0ba95a4483
Ensure all users are shown on leaderboard (even when API lookup fails)
2022-04-12 11:54:30 +09:00
Dean Herbert
ebee9e6888
Fix MultiplayerGameplayLeaderboard not immediately updating totals on scoring mode change
2022-04-12 11:27:27 +09:00
Dan Balasescu
94e2a90af2
Merge pull request #17767 from peppy/multiplayer-gameplay-leaderboard-test-improvements
...
Refactor multiplayer gameplay leaderboard tests to remove reliance on `Test` implementations
2022-04-12 11:19:53 +09:00
Salman Ahmed
bad30d9e60
Fix dialog dangerous button being clickable at edges
2022-04-11 21:05:37 +03:00
Dean Herbert
82939b0556
Fix skins getting duplicated when importing after export
...
Closes #17614 .
2022-04-12 00:29:19 +09:00
Dean Herbert
09d560c93e
Add test coverage of spectator requests
2022-04-11 19:27:14 +09:00
Dean Herbert
34457b4742
Expose mocked members as virtual on Multiplayer and SpectatorClient
2022-04-11 19:04:15 +09:00
Dean Herbert
abb42a54fd
Fix MultiplayerTestScene not actually setting match type correctly
2022-04-11 17:57:05 +09:00
Dan Balasescu
37976c569a
Merge pull request #17762 from peppy/fix-unobserved-exceptions
...
Avoid throwing unobserved exception when `PerformancePointsCounter` requests timed attributes
2022-04-11 14:50:12 +09:00
Dean Herbert
cb6e557212
Fix MasterGameplayClockContainer having incorrect rate-based offsets immediately after LoadComplete
...
I've attempted to explain why this is required using inline comments.
There's also further conversation at
https://github.com/ppy/osu/pull/17302#issuecomment-1091850927 .
2022-04-11 14:11:26 +09:00
Dean Herbert
808f0ecb74
Ensure running state is updated before performing Seek in GameplayClockContainer.Reset
2022-04-11 14:10:50 +09:00
Dean Herbert
2b74dbca28
Fix potential crash in DrawableRoom due to lack of null check on post-lookup beatmap
2022-04-11 13:44:34 +09:00
Dean Herbert
19b655d75b
Avoid throwing unobserved exception when PerformancePointsCounter requests timed attributes
2022-04-11 13:30:21 +09:00
Dan Balasescu
d482ab0287
Fix ParticleSpewer outputting NaN in vertices
2022-04-09 22:29:55 +09:00
Salman Ahmed
134d9b5ddf
Perform Show() at the bottom of the method
...
Probably not affecting behaviour, but makes more sense.
2022-04-08 19:28:04 +03:00
Dean Herbert
57fb8616b8
Fix potential null reference when attempting to highlight a message before overlay has been displayed
2022-04-09 00:31:00 +09:00
Dean Herbert
ae1e126837
Make HighlightMessage implicitly show chat overlay
2022-04-09 00:30:28 +09:00
Dan Balasescu
9ea6f9b1fe
Remove some incorrectly-firing asserts
2022-04-08 21:44:44 +09:00
Dan Balasescu
62f5409191
Merge pull request #17725 from peppy/multiplayer-hotifx
...
Avoid multiplayer crashes when events arrive in unexpected order
2022-04-08 20:23:37 +09:00
Dan Balasescu
1f5e435bb3
Merge pull request #17726 from peppy/update-framework
...
Update framework
2022-04-08 19:48:24 +09:00
Dean Herbert
ea4ca6d2ad
Update framework
2022-04-08 18:09:57 +09:00
Dean Herbert
5c571996d8
Avoid multiplayer crashes when events arrive in unexpected order
...
Intended to be a temporary fix for
https://github.com/ppy/osu/issues/17713 while a more permanent solution
is established. A proper fix is actually quite simple, but updating the
test to work with it is... *slightly* more complicated.
This hotfix will mean that if a `UserJoined` event arrives during the
unobserved window during room join (of the local user), the local user
still won't see the joining user, but the game won't crash as a result.
2022-04-08 17:55:47 +09:00
Dean Herbert
6bb8243212
Fix potential assert failure due to Room access from disconnection event
2022-04-08 17:41:03 +09:00
Dan Balasescu
975bb8cc2a
Merge pull request #17703 from peppy/fix-storyboard-fallback-animation-frame-count-weirdness
...
Fix `DrawableStoryboardAnimation` to handle skin fallback frame count similar to stable
2022-04-08 17:01:17 +09:00
Dan Balasescu
c48f8d7b9b
Merge pull request #17714 from bdach/mod-overlay/multimod-incompatibility
...
Ensure that mods grouped into multi mods are pairwise incompatible
2022-04-08 16:43:06 +09:00
Dean Herbert
933a722cfc
Remove secondary null checks which cannot exist (were on wrong thread)
2022-04-08 14:56:04 +09:00
Dean Herbert
24c2d465a9
Move null assert in MultiplayerPlayer on to update thread
2022-04-08 14:53:14 +09:00
Dean Herbert
64c63fe93a
Move null check in JoinRoom on to update thread
2022-04-08 14:52:56 +09:00
Dean Herbert
d50f41225f
Rename scheduleAsync to runOnUpdateThreadAsync
2022-04-08 14:43:53 +09:00
Dean Herbert
9ba99ed57d
Ensure all access to MultiplayerClient.Room is on the update thread
...
This was an implicit requirement until now, but not well documented
everywhere. Adding this makes it much easier to understand the
requirement (and probably safer).
2022-04-08 14:42:56 +09:00
Bartłomiej Dach
282b220d94
Fix test failure due to checking incompaatibility of flattened multi mods
2022-04-08 00:16:50 +02:00
Bartłomiej Dach
6630b38c08
Make all ModRateAdjust implementations incompatible with each other
2022-04-07 22:38:46 +02:00
Bartłomiej Dach
8175741a6c
Merge branch 'master' into fix-storyboard-fallback-animation-frame-count-weirdness
2022-04-07 21:49:32 +02:00
Bartłomiej Dach
71c0216c55
Add null check guards to unsubscriptions in Dispose()
2022-04-07 21:37:42 +02:00
Bartłomiej Dach
3016ce7817
Merge branch 'master' into bindable-safety-skin-editor
2022-04-07 20:59:44 +02:00
Bartłomiej Dach
e658b63dbc
Merge branch 'master' into clock
2022-04-07 20:27:23 +02:00
Salman Ahmed
a616f5bc2a
Fix regressed digital clock width conditional
2022-04-07 19:24:15 +03:00
Dean Herbert
11b4c5ca87
Fix potential null ref if UpdateTargetScreen is called too early
2022-04-07 23:42:42 +09:00
Salman Ahmed
c323020fcf
Fix Use24HourDisplay conditional flipped
2022-04-07 15:56:28 +03:00
Salman Ahmed
fb9fe4213d
Fix skin texture lookups not handling paths with extensions
2022-04-07 15:07:30 +03:00
Dean Herbert
a4d3afd06d
Fix multiple issues with bindable safety in SkinEditor components
2022-04-07 19:12:12 +09:00
Dean Herbert
b2c0eaeab4
Make string read better
2022-04-07 18:20:15 +09:00
Dean Herbert
555aee7b6a
Remove incorrect and pointless complexity to width changes
2022-04-07 18:16:14 +09:00
Dean Herbert
7530fe5adf
Move default specification to configuration initial value
2022-04-07 18:13:23 +09:00
Dean Herbert
37509e04a9
Rename variable and fix inspections
2022-04-07 18:11:30 +09:00
Dean Herbert
040afff670
Change DrawableStoryboardAnimation to derive from TextureAnimation
2022-04-07 17:35:59 +09:00
Dean Herbert
cbc4e5319d
Fix DrawableStoryboardAnimation to handle skin fallback frame count similar to stable
...
Reasoning is explained in the inline comment (basically, stable doesn't
care what the user specifies as the frame count when falling back to
skin resources).
This change also removes on to two layers of drawables, which should be
a win in heavy storyboards.
2022-04-07 17:35:56 +09:00
Dean Herbert
93bdca5211
Split out GetTextures helper function for LegacySkins
2022-04-07 17:28:48 +09:00
Dan Balasescu
f0698937b7
Merge pull request #17700 from peppy/fix-skin-lookups-extension-specified
...
Fix filename lookups on `LegacySkin`s going awry when extension is specified
2022-04-07 17:03:27 +09:00
Dan Balasescu
5af93bd85d
Merge pull request #17701 from peppy/fix-storyboard-animation-sizing
...
Fix storyboard animations getting incorrect positioning due to size not being set
2022-04-07 17:00:39 +09:00
Dean Herbert
a7e262627f
Fix DrawableStoryboardAnimation not specifying sizing correctly
...
Usually this would be handled by `TextureAnimation`, but because we are
inheriting from `DrawableAnimation` here for reasons, we needed to
implement this ourselves. Follows the implementation in
`TextureAnimation`.
2022-04-07 15:18:55 +09:00
Dean Herbert
eb0653fa7b
Merge pull request #17698 from Joehuu/fix-replay-button-local-being-disabled
...
Fix replay button being disabled when available locally but not online
2022-04-07 14:18:02 +09:00
Dean Herbert
205edb65a2
Fix filename lookups on LegacySkins going awry when extension is specified
...
Due to the logic present to handle `@2x` fallback, the extension was
potentially being added at the wrong point in the filename. This change
ensures that the lookup filenames are always correct.
Closes https://github.com/ppy/osu/issues/17690 .
2022-04-07 14:16:19 +09:00
Dean Herbert
9ed4f31048
Update resources
2022-04-07 13:35:07 +09:00
Joseph Madamba
358931842f
Move enabled setting to each case
2022-04-06 21:22:56 -07:00
Jamie Taylor
8a73831115
Add MP lobby 'warning' SFX for the final seconds of countdown
2022-04-07 13:12:33 +09:00
Joseph Madamba
4432a93d09
Fix replay button being disabled when available locally but not online
2022-04-06 20:43:56 -07:00
