1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-24 05:27:24 +08:00
Commit Graph

32615 Commits

Author SHA1 Message Date
Dan Balasescu
d6ae66384d
Merge branch 'master' into fix-hit-object-container-unbinding 2020-09-23 15:16:58 +09:00
Dan Balasescu
7efaa37447
Merge pull request #10211 from peppy/fix-editor-combo-colours
Fix editor not using beatmap combo colours initially on load
2020-09-23 13:55:50 +09:00
Dean Herbert
c38cd50723 Fix editor not using beatmap combo colours initially on load 2020-09-23 13:16:50 +09:00
Dan Balasescu
8562020eba
Merge pull request #10204 from peppy/add-editor-keybindings
Add editor key bindings to switch between screens
2020-09-23 13:04:01 +09:00
Dan Balasescu
625c146460
Merge pull request #10199 from peppy/fix-editor-binding-crash
Fix bindings not correctly being cleaned up in OsuHitObjectComposer
2020-09-23 12:38:18 +09:00
Dean Herbert
80fb8f074c Merge branch 'master' into add-editor-keybindings 2020-09-23 12:32:04 +09:00
Dean Herbert
260ca31df0 Change default mute key to Ctrl+F4 for now 2020-09-23 12:31:50 +09:00
Dan Balasescu
fbaa6675c2
Merge branch 'master' into fix-hit-object-container-unbinding 2020-09-23 12:05:14 +09:00
Dan Balasescu
3d90bb5e38
Merge pull request #10203 from peppy/fix-fail-animation
Fix fail animation breaking on post-fail judgements
2020-09-23 11:57:49 +09:00
Dan Balasescu
53788968c8
Merge pull request #10205 from peppy/fix-composer-distance-snap-selection
Fix compose mode not showing distance snap grid when entering with a selection
2020-09-23 11:55:42 +09:00
Dan Balasescu
32a7ef35a1
Merge pull request #10207 from peppy/ring-piece-less-children
Reduce children levels in RingPiece
2020-09-23 11:55:08 +09:00
Dan Balasescu
6d58973452
Merge pull request #10208 from peppy/reduce-all-hitobject-enumerator-complexity
Reduce complexity of AllHitObjects enumerator when nested playfields are not present
2020-09-23 11:50:10 +09:00
Bartłomiej Dach
941ff81d8d
Merge branch 'master' into fix-hit-object-container-unbinding 2020-09-22 16:38:35 +02:00
Dean Herbert
6dc382fff5
Merge pull request #10169 from frenzibyte/fix-new-samples-starting-while-gameplay-paused 2020-09-22 18:23:41 +09:00
Dean Herbert
e0a2321822 Reduce complexity of AllHitObjects enumerator when nested playfields are not present 2020-09-22 18:17:04 +09:00
Dean Herbert
b1f7cfbd5b Reduce children levels in RingPiece 2020-09-22 17:34:21 +09:00
Dean Herbert
0e01ac2d90
Merge branch 'master' into fix-new-samples-starting-while-gameplay-paused 2020-09-22 16:16:54 +09:00
Dean Herbert
77f9ba09a3
Merge pull request #9769 from frenzibyte/catch-combo-counter 2020-09-22 16:16:25 +09:00
Dean Herbert
8e43266460 Fix compose mode not showing distance snap grid when entering with a selection 2020-09-22 16:02:07 +09:00
Dean Herbert
3062fe4411 Add editor key bindings to switch between screens 2020-09-22 15:55:25 +09:00
Dean Herbert
3276b9ae9c Fix fail animation breaking on post-fail judgements 2020-09-22 15:08:53 +09:00
Dean Herbert
552968f65f Remove unnecessary using 2020-09-22 13:38:52 +09:00
Dean Herbert
7c40071b21 Revert changes to SkinnableTestScene but change load order 2020-09-22 13:35:35 +09:00
Dean Herbert
1b261f177f Disable rewind handling 2020-09-22 13:17:53 +09:00
Dean Herbert
1c58f568d6 Simplify and reformat rewind/transform logic 2020-09-22 12:54:21 +09:00
Dean Herbert
ffd4874ac0 Remove unnecessary double suffixes 2020-09-22 12:37:18 +09:00
Dean Herbert
08d8975566 Remove DisplayInitialCombo method for simplicity 2020-09-22 12:35:18 +09:00
Dean Herbert
92cda6bccb Adjust xmldoc slightly 2020-09-22 12:27:47 +09:00
Dean Herbert
a27a65bf03 Don't recreate explosion counter each increment 2020-09-22 12:25:40 +09:00
Dean Herbert
f629c33dc0 Make explosion additive to match stable 2020-09-22 12:14:31 +09:00
Dean Herbert
c5717d8e41
Merge branch 'master' into catch-combo-counter 2020-09-22 11:33:07 +09:00
Dean Herbert
e52a330dd8
Merge pull request #10196 from bdach/missing-hit-explosions
Add support for legacy miss & strong hit explosions
2020-09-21 23:59:36 +09:00
Dean Herbert
25bf160d94 Fix missing GameplayClock in some tests 2020-09-21 22:30:14 +09:00
Salman Ahmed
bfe332909c Remove "hide combo counter on break time" feature for being too complex
The combo counter will be hidden at most one second after the break has started anyways, so why not just remove this feature if the way of implementing it is complicated to be merged within the legacy counter implementation.
2020-09-21 14:32:14 +03:00
Dean Herbert
508278505f Make local clock private 2020-09-21 19:40:57 +09:00
Dean Herbert
3f788da06d Fix SPM changing incorrectly with playback rate changes 2020-09-21 19:39:54 +09:00
Dean Herbert
0cecb2bba3 Remove incorrect assumption from tests 2020-09-21 19:33:19 +09:00
Dean Herbert
dd5b15c64f Fix HitObjectContainer not correctly unbinding from startTime fast enough 2020-09-21 18:27:15 +09:00
Dean Herbert
842f8bea55 Fix bindings not correctly being cleaned up in OsuHitObjectComposer 2020-09-21 18:15:33 +09:00
Dean Herbert
1e09d8fd1a
Merge branch 'master' into catch-combo-counter 2020-09-21 17:53:00 +09:00
Dean Herbert
896aa7f3ea
Merge pull request #10198 from peppy/readme-add-ruleset-templates 2020-09-21 17:49:24 +09:00
Dean Herbert
5b697580af Add mention of ruleset templates to readme 2020-09-21 16:38:16 +09:00
Bartłomiej Dach
a0573af0e1 Fix test failure due to uninitialised drawable hit object 2020-09-20 20:44:31 +02:00
Bartłomiej Dach
4072abaed8 Allow miss explosions to be displayed 2020-09-20 19:40:30 +02:00
Bartłomiej Dach
1c7556ea5d Schedule explosion addition to ensure both hits are processed 2020-09-20 19:40:30 +02:00
Bartłomiej Dach
074387c676 Show strong hit explosion where applicable 2020-09-20 19:40:30 +02:00
Bartłomiej Dach
919b19612f Add lookups for strong hit explosions 2020-09-20 19:40:30 +02:00
Bartłomiej Dach
026fc2023b Add visual tests for strong hit explosions 2020-09-20 19:40:30 +02:00
Dean Herbert
e119b78e81
Merge pull request #10193 from tilda/notification-consistency-collections-import
Change collection deletion notification to be consistent
2020-09-20 21:32:41 +09:00
S Stewart
d2f498a268 remove unnec using 2020-09-19 15:13:52 -05:00