1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 06:17:44 +08:00
Commit Graph

40222 Commits

Author SHA1 Message Date
Nathan Alo
dec18ef826 implement BeatmapBackgroundWithStoryboard 2021-06-02 15:50:58 +08:00
Nathan Alo
5b436ee436 add beatmap with storyboard source 2021-06-02 15:50:33 +08:00
Dan Balasescu
8f1e64b606
Merge pull request #13258 from ekrctb/fix-scrolling-lifetime
Fix lifetime of scrolling hit object not updated when scrolling speed is adjusted
2021-06-02 11:48:48 +09:00
smoogipoo
d3d8941ec8 Make method internal 2021-06-02 11:11:41 +09:00
smoogipoo
8ee2b3a2d2 Merge branch 'master' into fix-scrolling-lifetime 2021-06-02 11:08:28 +09:00
Dan Balasescu
ac83450791
Merge pull request #13256 from ekrctb/update-lifetime-2
Update DHO lifetime on entry lifetime change
2021-06-02 11:07:54 +09:00
Bartłomiej Dach
e25d6bb11e
Merge pull request #13276 from peppy/update-framework
Update framework
2021-06-01 21:58:31 +02:00
Dean Herbert
92ffc4627f Update framework 2021-06-01 23:24:49 +09:00
Dan Balasescu
56cdd8dcb6
Merge pull request #13273 from gagahpangeran/inline-code-background
Add background colour for inline code markdown
2021-06-01 23:16:31 +09:00
Gagah Pangeran Rosfatiputra
b4dd935538
add corner radius and padding 2021-06-01 14:14:12 +07:00
Gagah Pangeran Rosfatiputra
5108dadfbc
use inline code in markdown text flow 2021-06-01 14:03:57 +07:00
Gagah Pangeran Rosfatiputra
1babb05fc7
add OsuMarkdownInlineCode 2021-06-01 14:03:31 +07:00
Dean Herbert
dce24e3d4d
Merge pull request #12950 from gagahpangeran/osu-wiki-overlay
Initial implementation of Wiki Overlay
2021-06-01 15:20:56 +09:00
Dean Herbert
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
ekrctb
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
Dean Herbert
00ffea5e2c Update tests to specify full absolute path 2021-06-01 14:38:30 +09:00
ekrctb
0f381f7758 Fix wrong code 2021-06-01 14:38:02 +09:00
Dean Herbert
6ef9b346e1 Fix newly found inspections from 2021.1EAP1 2021-06-01 14:33:21 +09:00
ekrctb
977d44df87 Add test catching lifetime change while KeepAlive is true 2021-06-01 14:28:23 +09:00
ekrctb
86020adf64 Revert invalid code transformation 2021-06-01 14:28:23 +09:00
Dean Herbert
27b7039520 Use constant 2021-06-01 14:02:32 +09:00
Dean Herbert
6e4730652e Push private methods down 2021-06-01 14:01:08 +09:00
Dean Herbert
3ff97f787a Localise all URL generation for now to avoid weird Schedule logic 2021-06-01 13:56:59 +09:00
ekrctb
d5714e63b9 Apply code styling suggestions
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2021-06-01 13:17:30 +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
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
Salman Ahmed
4e186b0cf5 ContentVisible -> HiddenByRulesetImplementation 2021-05-31 09:24:26 +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