Commit Graph

40284 Commits

Author SHA1 Message Date
1f8abcdf6c Merge branch 'master' into fix-relative-link-resolution 2021-06-01 16:49:02 +09:00
7c6400735f Merge branch 'master' into remove-hud-component-lookup 2021-06-01 10:17:52 +03:00
cb38abab35 Add local logic for creating default/legacy implementation based on cell skin 2021-06-01 10:17:01 +03:00
c090110ae2 Provide cell skin on content creation 2021-06-01 10:16:13 +03:00
b4dd935538 add corner radius and padding 2021-06-01 14:14:12 +07:00
5108dadfbc use inline code in markdown text flow 2021-06-01 14:03:57 +07:00
1babb05fc7 add OsuMarkdownInlineCode 2021-06-01 14:03:31 +07:00
cd8e3f3a04 Revert "Group all skinnable test scenes to one TestSceneSkinnableHUDComponents"
This reverts commit d1272d5e13.
2021-06-01 09:57:43 +03:00
dce24e3d4d Merge pull request #12950 from gagahpangeran/osu-wiki-overlay
Initial implementation of Wiki Overlay
2021-06-01 15:20:56 +09:00
bec836b4d6 Merge pull request #13272 from peppy/fix-new-inspections
Fix newly found inspections from 2021.1EAP1
2021-06-01 15:14:47 +09:00
40949f6c1b Simplify lifetime setter
Setting entry lifetime will cause `LifetimeChanged` event and `base.LifetimeStart`/`End` will be modified in the callback.
2021-06-01 14:46:43 +09:00
00ffea5e2c Update tests to specify full absolute path 2021-06-01 14:38:30 +09:00
0f381f7758 Fix wrong code 2021-06-01 14:38:02 +09:00
6ef9b346e1 Fix newly found inspections from 2021.1EAP1 2021-06-01 14:33:21 +09:00
977d44df87 Add test catching lifetime change while KeepAlive is true 2021-06-01 14:28:23 +09:00
86020adf64 Revert invalid code transformation 2021-06-01 14:28:23 +09:00
a9f4bc6285 Never return a null argument
Enable nullable
2021-06-01 14:11:17 +09:00
27b7039520 Use constant 2021-06-01 14:02:32 +09:00
6e4730652e Push private methods down 2021-06-01 14:01:08 +09:00
3ff97f787a Localise all URL generation for now to avoid weird Schedule logic 2021-06-01 13:56:59 +09:00
111bfd4d88 Fix relative URLs having a null argument after resolution to LinkDetails 2021-06-01 13:50:20 +09:00
1a05a5d2f0 Add test covering failure to resolve relative URLs 2021-06-01 13:50:04 +09:00
d5714e63b9 Apply code styling suggestions
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2021-06-01 13:17:30 +09:00
2d530256f5 Merge pull request #13265 from ekrctb/remove-unused-file
Remove unused `IScrollingHitObject` interface
2021-06-01 00:45:07 +09:00
86d1ba7ef2 Remove unused IScrollingHitObject interface 2021-05-31 23:17:26 +09:00
bd7814b487 Merge pull request #13257 from ekrctb/simplify-shoc
Multiple `ScrollingHitObjectContainer` logic simplification
2021-05-31 21:31:10 +09:00
69c4ccad05 Fix weird taiko logic failing for weird reasons that probably should not have been a thing 2021-05-31 21:29:47 +09:00
33577cbad5 Fix multiple issues with default lookups 2021-05-31 21:29:47 +09:00
1161378b6b Fix incorrect fallback logic in LegacyBeatmapSkin 2021-05-31 21:29:47 +09:00
282c5a9177 Fix potential nullref in SkinProvidingContainer 2021-05-31 21:29:47 +09:00
3ff9f9c89d Make FindProvider non-default 2021-05-31 21:29:47 +09:00
8e489754cc Add ability for LegacySkins to customise the fallback provider 2021-05-31 21:29:47 +09:00
88ed95e012 Add FindProvider lookup function 2021-05-31 21:29:47 +09:00
1d30791ab0 Add potential pathway for legacy lookups 2021-05-31 21:29:47 +09:00
4b27d43e26 Add new parameter for default fallback logic in LegacySkin 2021-05-31 21:29:47 +09:00
ff04942295 Change timing of HitObjectContainer.OnAdd/OnRemove
Now, `OnAdd` is always invoked after the DHO is added to the container.
This change is required by `ScrollingHitObjectContainer` to compute origin adjusted lifetime when origin position is relative to the parent drawable size.
2021-05-31 20:56:25 +09:00
9036b13637 Merge pull request #13260 from peppy/legacy-skin-resource-improvements
Allow `LegacyDefaultSkin` to be constructed without extra resource store parameter
2021-05-31 20:49:21 +09:00
77a57f8a41 Merge pull request #13262 from peppy/fix-broken-combo-colour-tests
Fix usage of DI before it's ready in combo colour tests
2021-05-31 20:43:30 +09:00
f60e9cb085 Remove weird override logic in TestCase methods 2021-05-31 20:00:47 +09:00
e78391db7a Fix usage of DI before it's ready in combo colour tests 2021-05-31 19:58:19 +09:00
17fa2426d4 Merge branch 'master' into legacy-skin-resource-improvements 2021-05-31 19:36:09 +09:00
ebfc24a499 Rename conflicting resources 2021-05-31 19:14:49 +09:00
65709ec7d7 Move leagcy resource store construction local to DefaultLegacySkin 2021-05-31 19:14:49 +09:00
46b6f49a92 Merge pull request #13230 from peppy/non-nullable-beatmapset-files
Make `BeatmapSet.Files` non-nullable
2021-05-31 19:10:03 +09:00
d1ef5483bc Merge pull request #12826 from frenzibyte/catch-hide-combo-workaround
Hide legacy HUD combo counters on osu!catch ruleset
2021-05-31 19:04:25 +09:00
b16d10bd95 Provide game-wide resources via IStorageResourceProvider 2021-05-31 18:57:47 +09:00
675fe37446 Change check order around to ensure re-fetches which return no results don't nullref 2021-05-31 18:35:18 +09:00
d4cb70735d Merge branch 'master' into non-nullable-beatmapset-files 2021-05-31 18:19:57 +09:00
d8768a8c01 Merge pull request #13254 from peppy/fix-editor-beatmap-creation-test-failure-again
Fix bindable lease failure in editor beatmap creation tests
2021-05-31 17:38:19 +09:00
948a14a627 Merge branch 'simplify-shoc' into fix-scrolling-lifetime
# Conflicts:
#	osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
2021-05-31 16:50:47 +09:00