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
|
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 |
|
ekrctb
|
86d1225aad
|
Reset lifetime to initial lifetime when layout is invalidated
|
2021-05-31 16:47:10 +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 |
|
ekrctb
|
56a0a24cba
|
Make SetInitialLifetime public
|
2021-05-31 15:33:28 +09:00 |
|
Dean Herbert
|
de0e51a81d
|
Merge branch 'master' into fix-skin-sample-lookup
|
2021-05-31 15:27:39 +09:00 |
|
Salman Ahmed
|
4e186b0cf5
|
ContentVisible -> HiddenByRulesetImplementation
|
2021-05-31 09:24:26 +03:00 |
|
Salman Ahmed
|
02d18c7a49
|
Merge branch 'master' into remove-hud-component-lookup
|
2021-05-31 09:23:04 +03:00 |
|
ekrctb
|
771f3c48c0
|
Add failing test showing lifetime not recomputed with pooled objects
|
2021-05-31 14:48:52 +09:00 |
|
ekrctb
|
b7afea37c4
|
Test drawable lifetime change on entry lifetime change
|
2021-05-31 14:45:29 +09:00 |
|
ekrctb
|
e25cca6fbe
|
Update drawable lifetime on entry lifetime change
|
2021-05-31 14:45:29 +09: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 |
|
Gagah Pangeran Rosfatiputra
|
113f90e92e
|
add back schedule is CurrentPath setter
|
2021-05-31 10:49:16 +07: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 |
|
Gagah Pangeran Rosfatiputra
|
3c7f1ae996
|
Merge branch 'master' into osu-wiki-overlay
|
2021-05-30 20:27:12 +07: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 |
|
Dean Herbert
|
dac1a98d8a
|
Merge branch 'master' into fix-skin-sample-lookup
|
2021-05-30 15:19:47 +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 |
|
Dean Herbert
|
f144fcf16e
|
Merge pull request #12862 from frenzibyte/beatmap-skin
Mark `WorkingBeatmap.GetSkin()` as abstract instead of using `DefaultSkin`
|
2021-05-29 17:21:57 +09:00 |
|
Dean Herbert
|
4e7d19a3af
|
Merge branch 'master' into beatmap-skin
|
2021-05-29 16:51:17 +09:00 |
|
Dean Herbert
|
951fc5ef6e
|
Remove misleading comment and misplaced bug fix
This shouldn't be fixed in a test scene; the underlying issue should be
fixed in actual game code.
|
2021-05-29 15:39:13 +09:00 |
|
Dean Herbert
|
9b239e308b
|
Merge branch 'master' into beatmap-skin
|
2021-05-29 15:36:43 +09:00 |
|
Dean Herbert
|
bf9ae2d656
|
Merge pull request #13237 from Susko3/fix-capitalization-of-catch-results
Fix capitalisation of osu!catch HitResults
|
2021-05-29 02:17:34 +09:00 |
|