1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 10:17:32 +08:00
Commit Graph

31599 Commits

Author SHA1 Message Date
Keijia
6e19521528
Merge branch 'master' into patch2 2020-08-22 18:53:40 +03:00
Dean Herbert
b98d4d9cff
Merge branch 'master' into hyperdash-full-catch-width 2020-08-22 19:55:45 +09:00
Dean Herbert
122265ff0e Revert non-track usage 2020-08-22 19:47:08 +09:00
Dean Herbert
db52260427 Rename and clarify comment regarding "previous" track disposal 2020-08-22 19:44:54 +09:00
Dean Herbert
b72f06fef6 Centralise and clarify LoadTrack documentation 2020-08-22 19:42:34 +09:00
Keijia
b5b2e523ad change switch cases 2020-08-22 12:10:31 +03:00
Dan Balasescu
0295ae2921
Merge pull request #9947 from bdach/mania-legacy-background-line-padding
Add padding to mania column borders to match stable
2020-08-22 12:52:47 +09:00
Dean Herbert
4d93014e1c
Merge branch 'master' into mania-legacy-background-line-padding 2020-08-22 10:23:05 +09:00
Dean Herbert
54439dc480
Merge pull request #9949 from bdach/key-binding-panel-test-indices
Adjust key binding panel tests to not rely on row indices
2020-08-22 10:09:56 +09:00
Keijia
f9fe37a8a5 Added test for "hp" filter keyword 2020-08-22 01:54:01 +03:00
Keijia
0b6185cd14 add "hp" filter keyword 2020-08-22 01:09:35 +03:00
Bartłomiej Dach
809a61afcb Adjust key binding panel tests to not rely on row indices 2020-08-21 23:37:54 +02:00
Bartłomiej Dach
891f5cb130 Add padding to mania column borders to match stable 2020-08-21 20:00:20 +02:00
smoogipoo
08078b9513 Rename method to remove "InitialColour" namings 2020-08-22 00:56:29 +09:00
smoogipoo
356c67f00d Remove outdated/wrong test 2020-08-22 00:55:03 +09:00
smoogipoo
f89b6f4465 Add xmldocs 2020-08-22 00:52:53 +09:00
smoogipoo
9fbc5f3aeb Update taiko with legacy colour setters 2020-08-22 00:23:08 +09:00
smoogipoo
16a2ab9dea Update osu with legacy colour setters 2020-08-22 00:20:33 +09:00
smoogipoo
454564b189 Update mania with legacy colour setters 2020-08-22 00:19:15 +09:00
smoogipoo
eaba323353 Update catch with legacy colour setters 2020-08-22 00:17:35 +09:00
smoogipoo
2424fa0802 Add helper methods 2020-08-22 00:15:58 +09:00
smoogipoo
88d50b6c47 Remove alpha mangling from LegacyDecoder 2020-08-22 00:15:37 +09:00
smoogipoo
b3338347b7 Remove fade on successful hits 2020-08-21 23:56:27 +09:00
smoogipoo
8632c3adf0 Fix hold notes bouncing with SV changes 2020-08-21 23:11:15 +09:00
Dan Balasescu
8c454cee6b
Merge pull request #9943 from peppy/fix-double-storyboard-sample-dispose-crash
Fix potential crash if disposing a DrawableStoryboardSample twice
2020-08-21 20:11:27 +09:00
Dan Balasescu
42ee9b75df
Apply suggestions from code review
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-08-21 19:38:59 +09:00
Dean Herbert
f63d1ba612 Remove stray call to LoadTrack that was forgotten 2020-08-21 18:52:53 +09:00
Dean Herbert
4239e9f684 Fix storyboard test not actually working due to incorrect track referencing 2020-08-21 18:44:14 +09:00
Dean Herbert
308d9f5967 Ensure locally executed methods are always loaded before propagation 2020-08-21 18:43:58 +09:00
Dean Herbert
1edafc39ba Fix intro welcome playing double due to missing conditional 2020-08-21 18:33:24 +09:00
Dean Herbert
d4a7e8cee8 Merge branch 'fix-double-storyboard-sample-dispose-crash' into beatmap-track-rework 2020-08-21 18:28:31 +09:00
Dean Herbert
69cb9f3091 Fix potential crash if disposing a DrawableStoryboardSample twice 2020-08-21 18:19:47 +09:00
smoogipoo
aead13628b Rework freezing to use masking 2020-08-21 17:52:42 +09:00
Dean Herbert
d5cbb589c2 Revert some test scene changes to use Beatmap.Track where relevant 2020-08-21 17:21:08 +09:00
Dean Herbert
a47b8222b5 Restore multiplayer to use beatmap track 2020-08-21 17:11:29 +09:00
Dean Herbert
70697cf1a0 Restore remaining editor components to use Beatmap.Track 2020-08-21 17:11:29 +09:00
Dean Herbert
3b03116179 Remove unnecessary using statement 2020-08-21 16:45:59 +09:00
Dean Herbert
2ea6763c73
Merge pull request #9931 from smoogipoo/add-droplet-hypers 2020-08-21 16:13:18 +09:00
Dean Herbert
0ae460fb8f Avoid beatmap load call in IntroScreen 2020-08-21 15:50:14 +09:00
Dean Herbert
f7e4feee34 Update remaining Player components to use WorkingBeatmap again 2020-08-21 15:25:57 +09:00
Dean Herbert
d2c2e8bbe8 Revert some more usage of MusicController back to WorkingBeatmap 2020-08-21 15:17:21 +09:00
Dean Herbert
0b0ff62647 Switch timeline to use track directly from beatmap again 2020-08-21 14:49:34 +09:00
smoogipoo
37cf7999b1 Merge branch 'master' into hold-note-freeze 2020-08-21 14:39:25 +09:00
Dean Herbert
526f06be4c Add back track loaded bool in WorkingBeatmap 2020-08-21 13:53:37 +09:00
Dean Herbert
05b402132e Merge branch 'master' into beatmap-track-rework 2020-08-21 13:25:04 +09:00
smoogipoo
62d833d63d Fix comment 2020-08-21 13:14:50 +09:00
smoogipoo
6ad7a3686b Simplify condition 2020-08-21 13:13:08 +09:00
smoogipoo
855b5ba4ed Merge branch 'master' into add-droplet-hypers 2020-08-21 13:09:16 +09:00
Dean Herbert
25ee1fa7a2
Merge pull request #9933 from bdach/fix-catch-double-sample 2020-08-21 13:08:26 +09:00
Dean Herbert
357fb3a10e Merge branch 'master' into beatmap-track-rework 2020-08-21 12:53:09 +09:00