Commit Graph

49918 Commits

Author SHA1 Message Date
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
05c7e09d79 Make Textures and Samples read-only 2022-03-24 00:02:38 +09:00
6542f974f2 Merge branch 'master' into skin-fuck 2022-03-23 15:30:22 +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
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
8192fb47fe Merge branch 'master' into skin-editor-eat-input 2022-03-22 19:22:48 +01:00
c8d48f89e8 Remove unnecessary local 2022-03-22 19:13:22 +01:00
94c5207f36 Fix test not actually testing desired scenario anymore
The test was checking the test scene's own `SelectedMods` bindable
rather than the multiplayer screen's, and the former was never actually
being mutated by anything. Therefore the case would pass even on
`master` with the fix reverted.
2022-03-22 19:04:32 +01:00
6e55d7df02 Merge pull request #17406 from mcpower/vscode-recommended-extensions
Add C# extension to recommended VS Code extensions
2022-03-22 19:18:05 +09:00
5631726164 Add C# extension to recommended VS Code extensions
The [official C# extension] is maintained by Microsoft and enables
IDE-like support for C# in VS Code.

If a user opens this repository in VS Code, they will be prompted to
install it if they haven't already installed it. After installation, the
extension will also prompt the user to install the .NET SDK if it's not
found.

[official C# extension]: https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.csharp
2022-03-22 20:33:27 +11:00
09ec49e6fa Rename realm-backed resource store in preparation for non-legacy usage 2022-03-22 18:31:18 +09:00
804e856160 Move and refactor test in line with functionality changes 2022-03-22 17:38:43 +09:00
ff8352b749 Merge branch 'master' into screen-mod-retention 2022-03-22 17:27:26 +09:00
61ddf1e6cf Disallow exiting the editor without saving (unless explicitly confirming) 2022-03-22 15:42:56 +09:00
f95bd89166 Revert editor exit behaviour to exit without changes for now 2022-03-22 14:46:57 +09:00
056e568ffb Merge pull request #17401 from peppy/update-date-added-on-use-existing
Fix beatmap date added not being updated on reimporting a soft deleted beatmap
2022-03-22 14:41:07 +09:00
fb7f9a81db Remove unnecessary equality check in skin editor construction path 2022-03-22 14:35:13 +09:00
0fcb3bdba9 Fix beatmap date added not being updated on reimporting a soft deleted beatmap
Addresses concerns raised in https://github.com/ppy/osu/discussions/17399.
2022-03-22 14:10:36 +09:00
33d97f53cb Fill in assert details, remove whitespace 2022-03-21 22:58:53 -04:00
aaf2edace9 remove code from old incorrect test 2022-03-21 22:48:08 -04:00
74ce009ed8 [WIP] Multiplayer Mods Regression Test 2022-03-21 22:46:20 -04:00
17b639b404 Implement suggested change to wipe mods on multiplayer screen 2022-03-21 22:42:17 -04:00
36772ec652 Merge pull request #17356 from apollo-dw/strict-tracking
Implement "Strict Tracking" mod in osu!
2022-03-22 07:32:36 +09:00
aea03ca21d Merge pull request #17359 from frenzibyte/fix-score-panel-max-combo
Improve method of retrieving beatmap maximum combo for results score panels
2022-03-22 06:28:30 +09:00
9a2691c1bc Remove unnecessary schedule 2022-03-21 23:54:47 +09:00