Commit Graph

53736 Commits

Author SHA1 Message Date
e658b63dbc Merge branch 'master' into clock 2022-04-07 20:27:23 +02:00
a616f5bc2a Fix regressed digital clock width conditional 2022-04-07 19:24:15 +03:00
11b4c5ca87 Fix potential null ref if UpdateTargetScreen is called too early 2022-04-07 23:42:42 +09:00
0e92486240 Update various licence years to 2022 2022-04-07 22:05:04 +09:00
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
c323020fcf Fix Use24HourDisplay conditional flipped 2022-04-07 15:56:28 +03:00
fb9fe4213d Fix skin texture lookups not handling paths with extensions 2022-04-07 15:07:30 +03:00
5b29ddd2ed Add further test coverage against paths with extensions 2022-04-07 15:05:08 +03:00
a4d3afd06d Fix multiple issues with bindable safety in SkinEditor components 2022-04-07 19:12:12 +09:00
b2c0eaeab4 Make string read better 2022-04-07 18:20:15 +09:00
555aee7b6a Remove incorrect and pointless complexity to width changes 2022-04-07 18:16:14 +09:00
7530fe5adf Move default specification to configuration initial value 2022-04-07 18:13:23 +09:00
37509e04a9 Rename variable and fix inspections 2022-04-07 18:11:30 +09:00
0674862b6c Fix failing tests 2022-04-07 17:52:08 +09:00
040afff670 Change DrawableStoryboardAnimation to derive from TextureAnimation 2022-04-07 17:35:59 +09:00
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
93bdca5211 Split out GetTextures helper function for LegacySkins 2022-04-07 17:28:48 +09:00
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
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
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
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
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
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
b7f8716de9 Add test coverage of skin lookups failing when @2x and extension are present 2022-04-07 14:11:38 +09:00
9ed4f31048 Update resources 2022-04-07 13:35:07 +09:00
358931842f Move enabled setting to each case 2022-04-06 21:22:56 -07:00
8a73831115 Add MP lobby 'warning' SFX for the final seconds of countdown 2022-04-07 13:12:33 +09:00
4432a93d09 Fix replay button being disabled when available locally but not online 2022-04-06 20:43:56 -07:00
edb556643e Add failing replay button enabled test asserts 2022-04-06 20:43:56 -07:00
c997d0fcf0 Merge pull request #17631 from bdach/mod-overlay/full-screen
Implement basic layout & behaviour of new mod select screen
2022-04-07 10:23:49 +09:00
4c20e67478 Merge pull request #17683 from huoyaoyuan/remove-outdated
Remove some outdated packages
2022-04-07 10:13:15 +09:00
c440d89ef9 Merge pull request #17678 from peppy/get-virtual-time-length
Change `WorkingBeatmap.GetVirtualTrack` to use length provided by `BeatmapInfo`
2022-04-07 09:32:59 +09:00
4b3569ea79 Merge pull request #17576 from peppy/fix-multiplayer-unobserved
Centralise exception handling of `MultiplayerClient` calls
2022-04-07 09:09:55 +09:00
c1693e4387 Use LegacySkinPlayerTestScene instead of reimplementing 2022-04-07 00:13:56 +03:00
4f928232ee Merge pull request #17677 from peppy/fix-multiplayer-match-song-select-realm
Fix dangerous realm operation in `TestSceneMultiplayerMatchSongSelect`
2022-04-06 22:28:57 +02:00
bcb9eef082 Merge branch 'master' into fix-multiplayer-match-song-select-realm 2022-04-06 21:58:12 +02:00
ec4f1bcbc8 Remove outdated NETCore packages. 2022-04-06 19:18:18 +08:00
43724f477a Remove outdated NU1701 warning. 2022-04-06 19:14:00 +08:00
2c8fcadb97 Merge pull request #17679 from peppy/ensure-intro-is-protected
Ensure intro beatmap has protected flag set
2022-04-06 19:06:41 +09:00
c42ef43faa Ensure intro beatmap has protected flag set
In cases this isn't set, the beatmap has likely entered a bad state.

Closes https://github.com/ppy/osu/issues/17659.
2022-04-06 16:46:53 +09:00
065bb60324 Remove unused using statements 2022-04-06 16:05:11 +09:00
c2b2d443ed Add more comprehensive assert output to try and discern CI issues 2022-04-06 15:31:12 +09:00
2b8a5833dd Fix back-to-front conditional check 2022-04-06 15:13:02 +09:00
d17890ca9a Replace a couple more local test beatmap cases which can instead use TestResources methods 2022-04-06 15:04:15 +09:00
552ec5282f Change WorkingBeatmap.GetVirtualTrack to use length provided by BeatmapInfo
A lot of tests are using test resources that populate the length field,
but do not populate hitobjects. The general expectation is that
components should be using the cached length in cases where hitobjects
are not relevant, but `GetVirtualTrack` was doing its own local
calculation.

This could cause tests to fail due to `MusicController` changing track
in the background.
2022-04-06 14:51:15 +09:00
220d7bc6db Fix dangerous realm operation in TestSceneMultiplayerMatchSongSelect
The import process was running on the async load thread, but then
accessed from the access thread later on. This seemed to somehow pass
fine in headless runs, but would fail on visual test execution
(specifically on `TestBeatmapConfirmed()`).
2022-04-06 14:01:41 +09:00
f795f77cf9 Add missing newline 2022-04-06 14:00:54 +09:00
a3695c7e97 Merge branch 'master' into fix-spectator-seeks 2022-04-06 12:58:43 +09:00
c540810943 Merge branch 'master' into fix-multiplayer-unobserved 2022-04-06 11:33:10 +09:00
01da3924cc Simplify IsCurrentScreen check to only apply to relevant call 2022-04-06 11:32:35 +09:00