6f529cf7a4
Merge branch 'master' into fix-spectator-seeks
2022-03-24 14:24:20 +09:00
4d0b4c2541
Fix realm potentially not being refreshed in time for test asserts in BeatmapImporterTests
...
As seen at https://github.com/ppy/osu/runs/5659368512?check_suite_focus=true
Went through every usage of `.Import` and added either an
`EnsureLoaded`, or where that provides too many checks, an explicit
`realm.Refresh()`.
2022-03-24 12:59:17 +09:00
e243a7c55d
Reword storage param xmldoc to use stronger and better defined langauge
2022-03-24 12:45:11 +09:00
0cd29a73b9
Fix typo in xmldocs
2022-03-24 12:39:47 +09:00
a4d17a915f
Fix incorrect HUD component fallback
...
Legacy skins should now always show the legacy hud components. The
conditional here is no longer valid as fallback lookups happen at a
*skin*-fallback level rather than internal *source*-fallback.
Put another way, `LegacyDefaultSkin` (with user customisations) should
still display the classic HUD components even if a font is not provided,
as that font will be available via the skin lookup hierarchy.
The TODO removed in this commit has been already resolved so this code
is no longer required.
2022-03-24 12:36:20 +09:00
3b97de04b7
Merge pull request #17419 from peppy/fix-hitsound-regresssssssion
...
Fix hitsounds not always playing when they should
2022-03-24 11:53:18 +09:00
547418e47e
Revert "Remove PopoverButton class"
...
This reverts commit 6b712be97d
2022-03-24 11:15:51 +09:00
7296bad294
Convert LegacyBeatmapSkin to use nullable
2022-03-24 00:24:06 +09:00
194bf4fb05
Convert LegacySkin to use nullable
2022-03-24 00:23:55 +09:00
3e020073c5
Convert Skin to use nullable
2022-03-24 00:23:55 +09:00
05c7e09d79
Make Textures and Samples read-only
2022-03-24 00:02:38 +09:00
6cd67928ab
Simplify documentation of ModUsage
2022-03-23 15:48:52 +03:00
b218046fa2
Remove redundant line from mod usage
2022-03-23 15:38:48 +03:00
c079a9cd32
Add comment regarding equality check importance in LegacyHitSampleInfo
2022-03-23 20:18:44 +09:00
997c091a8d
Revert "Remove IsLayered from LegacyHitSampleInfo comparison"
...
This reverts commit 4523393208
2022-03-23 20:15:17 +09:00
2ea9e5245c
Revert "Remove IsLayered from GetHasCode implementation"
...
This reverts commit 16ee6b5fc7
2022-03-23 20:15:13 +09:00
34a367b369
Merge branch 'master' into multiplayer-countdown-timers-2
2022-03-23 15:40:50 +09:00
6542f974f2
Merge branch 'master' into skin-fuck
2022-03-23 15:30:22 +09:00
a83a90e675
Rename countdown Delay -> Duration
2022-03-23 15:21:16 +09:00
f7c0047206
Send time remaining in countdowns instead
2022-03-23 15:19:43 +09:00
078288a616
Make "skin.ini" the default skin filename and remove redundant parameters
2022-03-23 15:05:01 +09:00
7a1909bf97
Change parameter order of LegacySkin to put IStorageResourceProvider first
...
The optional resource store should not be before the (basically)
required resource provider.
2022-03-23 15:02:04 +09:00
d0ea1739b4
Remove skin configuration stream logic as it is no longer required
2022-03-23 14:57:42 +09:00
9d3c6ade62
Remove unnecessary skin reading hack in DefaultLegacySkin
2022-03-23 14:57:42 +09:00
6c405f1dee
Remove storage override from LegacyBeatmapSkin
2022-03-23 14:57:42 +09:00
b48aa1d8fa
Ensure HitObjectSampleTest's TestWorkingBeatmap provides the marking resource store correctly
2022-03-23 14:57:42 +09:00
e56d13d8be
Fix realm backed store not being initialised for some tests
2022-03-23 14:57:42 +09:00
a5acd38fd5
Fix HitObjectSampleTest adding null files to realm models
2022-03-23 14:57:42 +09:00
00aea9bef0
Only use legacy resources lookup for protected (aka default) skin
2022-03-23 14:57:42 +09:00
3c38b14228
Documentation improvements
2022-03-23 14:57:42 +09:00
32e2cfb8ee
Leave realm resource store construction to base class
2022-03-23 14:57:42 +09:00
e1236e07ad
Fix extensions not being specified in time for realm file caching
2022-03-23 14:57:42 +09:00
a7f63fb034
Make providing a custom ResourceStore to LegacyBeatmapSkin optional (for tests only)
2022-03-23 14:57:42 +09:00
35d2f973a3
Prefer provided resource store over realm backed to keep tests working
2022-03-23 14:57:42 +09:00
b4d89b4e31
Replace duplicate LegacySkinResourceStore class with RealmBackedResourceStore
2022-03-23 14:57:42 +09:00
5c4a74378d
Remove Textures and Samples initialisation to Skin
2022-03-23 14:57:42 +09:00
999ddff3d4
Merge pull request #17414 from peppy/update-localisation-analyser
...
Update LocalisationAnalyser to support .net6
2022-03-23 11:41:11 +09:00
657daf07d7
Update LocalisationAnalyser to support .net6
2022-03-23 11:03:24 +09:00
d4ad4ac9db
Limit countdown updates to once per second
2022-03-23 10:50:05 +09:00
6b712be97d
Remove PopoverButton class
2022-03-23 10:40:38 +09:00
9138aaf780
Split MultiplayerReadyButton
2022-03-23 10:38:56 +09:00
1ffa1e1219
Merge pull request #17400 from nagilson/screen-mod-retention
...
Fix mods from single player carrying over to multiplayer
2022-03-23 08:36:15 +09:00
cda46ec8a3
Merge pull request #17403 from peppy/editor-exit-harsh-blocking
...
Disallow exiting the editor without saving (unless explicitly confirming)
2022-03-23 07:45:31 +09:00
8591630e5c
Merge branch 'master' into editor-exit-harsh-blocking
2022-03-23 07:06:25 +09:00
d84865ff76
Merge pull request #17384 from peppy/hold-to-discard-changes
...
Add hold-to-confirm flow for discarding editor changes
2022-03-23 07:05:56 +09:00
51a1721bc9
Fix unprotected access to potentially-null DI'd dialog overlay
2022-03-22 22:10:05 +01:00
f3aad77239
Remove unused local variable
2022-03-22 22:00:24 +01:00
a38bafab91
Remove unused using directive
2022-03-22 22:00:05 +01:00
8647bebdca
Merge branch 'master' into hold-to-discard-changes
2022-03-22 20:37:43 +01:00
2f01129322
Merge pull request #17386 from peppy/skin-editor-eat-input
...
Fix keyboard controls not working to adjust skin settings
2022-03-22 19:52:01 +01:00
