Dean Herbert
14570b6fb1
Merge branch 'master' into autoplay-pause-support
2021-06-01 14:19:21 +09:00
Dan Balasescu
2d530256f5
Merge pull request #13265 from ekrctb/remove-unused-file
...
Remove unused `IScrollingHitObject` interface
2021-06-01 00:45:07 +09:00
ekrctb
86d1ba7ef2
Remove unused IScrollingHitObject interface
2021-05-31 23:17:26 +09:00
Dan Balasescu
bd7814b487
Merge pull request #13257 from ekrctb/simplify-shoc
...
Multiple `ScrollingHitObjectContainer` logic simplification
2021-05-31 21:31:10 +09:00
ekrctb
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
Dan Balasescu
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
Dan Balasescu
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
Dean Herbert
f60e9cb085
Remove weird override logic in TestCase methods
2021-05-31 20:00:47 +09:00
Dean Herbert
e78391db7a
Fix usage of DI before it's ready in combo colour tests
2021-05-31 19:58:19 +09:00
Dean Herbert
17fa2426d4
Merge branch 'master' into legacy-skin-resource-improvements
2021-05-31 19:36:09 +09:00
Dean Herbert
ebfc24a499
Rename conflicting resources
2021-05-31 19:14:49 +09:00
Dean Herbert
65709ec7d7
Move leagcy resource store construction local to DefaultLegacySkin
2021-05-31 19:14:49 +09:00
Dan Balasescu
46b6f49a92
Merge pull request #13230 from peppy/non-nullable-beatmapset-files
...
Make `BeatmapSet.Files` non-nullable
2021-05-31 19:10:03 +09:00
Dean Herbert
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
Dean Herbert
b16d10bd95
Provide game-wide resources via IStorageResourceProvider
2021-05-31 18:57:47 +09:00
Dean Herbert
675fe37446
Change check order around to ensure re-fetches which return no results don't nullref
2021-05-31 18:35:18 +09:00
Dean Herbert
d4cb70735d
Merge branch 'master' into non-nullable-beatmapset-files
2021-05-31 18:19:57 +09:00
Dan Balasescu
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
ekrctb
6d96846776
Remove scrollLength caching field
...
It was not clear when the field is updated.
2021-05-31 16:28:02 +09:00
ekrctb
742c5b442b
Remove delay of lifetime update
...
The scheduling is no longer necessary because `OnAdd` is changed to not invoked immediately for non-pooled DHOs.
2021-05-31 16:24:13 +09:00
ekrctb
3cedc0824d
Don't add nested hit objects to the sets
...
Only top-level hit objects are checked for layout computation caching.
Also, lifetime of nested hit objects are not managed by the HitObjectContainer.
2021-05-31 16:20:35 +09:00
Salman Ahmed
4e186b0cf5
ContentVisible -> HiddenByRulesetImplementation
2021-05-31 09:24:26 +03:00
Dan Balasescu
8c6277f0d8
Merge pull request #13235 from ekrctb/update-lifetime-1
...
Update hit object lifetime on `HitObject.DefaultsApplied`
2021-05-31 14:44:40 +09:00
Dan Balasescu
76f073ee83
Merge pull request #13218 from peppy/osu-game-base-cleanup
...
Tidy up OsuGameBase
2021-05-31 14:38:18 +09:00
Dean Herbert
5925beaf21
Fix bindable lease failure in editor beatmap creation tests
2021-05-31 14:24:46 +09:00
Dean Herbert
06bd696cc2
Remove previous consumption logic in GetWorkingBeatmap
...
This should not be required since the introduction of `workingCache`,
which does the same thing in a more global way.
2021-05-31 14:11:58 +09:00
ekrctb
0c101d2859
Apply comment rewording suggestion
...
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2021-05-31 13:41:49 +09:00
smoogipoo
a4dca6f839
Reorder methods around load()
2021-05-31 13:39:18 +09:00
Dan Balasescu
1ba607b3ff
Merge branch 'master' into osu-game-base-cleanup
2021-05-31 13:32:09 +09:00
Salman Ahmed
fb111e23d8
Remove "temporarily"
2021-05-31 07:24:59 +03:00
Dean Herbert
acd9ed40d9
Merge pull request #13251 from smoogipoo/fix-handleframe-crash
...
Fix HandleFrame crashing when not playing
2021-05-31 12:02:23 +09:00
smoogipoo
bca8a9ea53
Fix HandleFrame crashing when not playing
2021-05-31 10:02:02 +09:00
Bartłomiej Dach
ab077c6656
Merge branch 'master' into non-nullable-beatmapset-files
2021-05-31 00:10:03 +02:00
Bartłomiej Dach
be0605450b
Merge pull request #12860 from peppy/editor-exit-stability
2021-05-31 00:09:41 +02:00
Salman Ahmed
3fbd4e276d
Add simple xmldoc
2021-05-31 00:07:29 +03:00
Bartłomiej Dach
78213e09d4
Merge branch 'master' into editor-exit-stability
2021-05-30 23:03:50 +02:00
Salman Ahmed
d12e93bfc6
Add skin traget resetting on setup/teardown steps
2021-05-31 00:02:55 +03:00
Dean Herbert
f3bde258a2
Merge pull request #13232 from ekrctb/initial-lifetime
...
Fix wrong/misleading comment of `InitialLifetimeOffset`
2021-05-30 22:26:47 +09:00
Dean Herbert
ef937216a9
Merge pull request #12949 from gagahpangeran/main-page-wiki
...
Add wiki main page
2021-05-30 22:11:12 +09:00
Dean Herbert
f35cf2d846
Merge branch 'master' into main-page-wiki
2021-05-30 21:01:05 +09:00
Salman Ahmed
60b781701f
Rewrite catch combo counter hide logic
2021-05-30 14:22:11 +03:00
Salman Ahmed
fb81e5133f
Merge branch 'master' into catch-hide-combo-workaround
2021-05-30 14:16:46 +03:00
Dean Herbert
656b286c78
Merge pull request #12875 from frenzibyte/legacy-beatmap-skin-hud-fallback
...
Fix legacy beatmap skins not properly falling back on HUD components request
2021-05-30 20:11:07 +09:00
Dean Herbert
17574833fb
Update other transformers with similar refactored logic
2021-05-30 19:15:59 +09:00
Dean Herbert
50d71faf56
Restructure lookup code to avoid repeating the base call
2021-05-30 17:55:10 +09:00
ekrctb
abb77b95b4
Fix comment grammar
2021-05-30 13:06:28 +09:00
Salman Ahmed
fbc316ea1d
Fix legacy skin transformers potentially ignoring source implementations
2021-05-29 21:23:22 +03:00
Salman Ahmed
53cbf369d7
Fix potential nullref
2021-05-29 21:22:46 +03:00
Salman Ahmed
200fecc774
Fix missing using directive
2021-05-29 21:22:39 +03:00
Salman Ahmed
42618c713f
Merge branch 'master' into legacy-beatmap-skin-hud-fallback
2021-05-29 20:56:05 +03:00
