Dan Balasescu
e6e475118f
Merge pull request #17724 from peppy/fix-disconnect-assert-issue
...
Fix potential assert failure due to `Room` access from disconnection event
2022-04-08 19:44:20 +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
Dan Balasescu
21b81b693d
Merge pull request #17721 from peppy/multiplayer-client-thread-safety
...
Add and assert thread safety of `MultiplayerClient.Room`
2022-04-08 16:31:08 +09:00
Dean Herbert
879267862c
Fix typo in DrawableOsuHitObject
2022-04-08 15:20:22 +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
e99d0f9fae
Make all OsuModObjectScaleTween implementations incompatible with each other
2022-04-07 22:38:47 +02:00
Bartłomiej Dach
5e02ba353b
Make OsuMod{Blinds,Flashlight} incompatible
2022-04-07 22:38:46 +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
112096768b
Add test checking incompatibility of multi mods
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
d256bd2cc7
Merge pull request #17704 from peppy/bindable-safety-skin-editor
...
Fix multiple issues with bindable safety in `SkinEditor` components
2022-04-07 21:43:56 +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
04db80848b
Remove unused using directives
2022-04-07 21:24:50 +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
926710beac
Merge pull request #17670 from perrymacmurray/clock
...
Add support for 12-hour time on toolbar clock
2022-04-07 20:58:58 +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
Dean Herbert
0e92486240
Update various licence years to 2022
2022-04-07 22:05:04 +09:00
Dean Herbert
c40b1bf30c
Merge pull request #17708 from frenzibyte/fix-texture-lookups-no-longer-handling-paths
...
Fix skin texture lookups not handling paths with extensions
2022-04-07 22:01:40 +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
Salman Ahmed
5b29ddd2ed
Add further test coverage against paths with extensions
2022-04-07 15:05:08 +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
0674862b6c
Fix failing tests
2022-04-07 17:52:08 +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
04235ca76e
Merge pull request #17699 from nekodex/mp-countdown-sfx-2
...
Add MP lobby 'warning' SFX for the final seconds of countdown
2022-04-07 14:13:29 +09:00
Dean Herbert
b7f8716de9
Add test coverage of skin lookups failing when @2x and extension are present
2022-04-07 14:11:38 +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
