1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 15:12:57 +08:00
Commit Graph

34188 Commits

Author SHA1 Message Date
smoogipoo
cdbedbb8a4 Merge branch 'osu-editor-pooling' into osu-hitobject-pooling 2020-11-13 18:07:05 +09:00
smoogipoo
864e4006b9 Fix timeline test 2020-11-13 17:51:01 +09:00
Dean Herbert
7ce188522e
Merge branch 'master' into osu-hitobject-pooling 2020-11-13 17:34:35 +09:00
Dean Herbert
df7032bc6c
Merge pull request #10803 from smoogipoo/nested-hitobject-pooling
Add nested hitobject pooling
2020-11-13 17:34:10 +09:00
smoogipoo
f7f70d41df Add osu! editor pooling support 2020-11-13 17:28:26 +09:00
smoogipoo
3c91626132 Merge branch 'pooling-editor-support' into osu-editor-pooling 2020-11-13 17:27:00 +09:00
smoogipoo
688a442fb3 Add missing dictionary 2020-11-13 17:26:46 +09:00
smoogipoo
942ecde0e1 Merge branch 'master' into pooling-editor-support 2020-11-13 17:23:35 +09:00
smoogipoo
0219aff7bc Add timeline visible range adjustment 2020-11-13 17:10:29 +09:00
Dean Herbert
8268b33392
Merge pull request #10822 from peppy/update-framework
Update framework
2020-11-13 17:10:07 +09:00
smoogipoo
3957697c48 Add pooling support to the editor 2020-11-13 17:08:20 +09:00
smoogipoo
4ef2e9548c Pass HitObjectComposer to BlueprintContainer via ctor 2020-11-13 16:59:37 +09:00
Dean Herbert
06fd0d08d1
Merge branch 'master' into nested-hitobject-pooling 2020-11-13 16:53:20 +09:00
Dean Herbert
8b2f7434a6
Merge pull request #10797 from smoogipoo/hitobject-pooling-base
Implement top-level hitobject pooling
2020-11-13 16:52:06 +09:00
Dean Herbert
a9fc7572ed Update framework 2020-11-13 15:33:27 +09:00
smoogipoo
beb6bbd2a1 Implement now abstract method 2020-11-13 14:58:32 +09:00
smoogipoo
7085b25898 Merge branch 'hitobject-pooling-base' into osu-hitobject-pooling 2020-11-13 14:57:59 +09:00
smoogipoo
4236dd826d Improve documentation and make abstract again 2020-11-13 14:57:09 +09:00
smoogipoo
a07d4a7915 Remove unnecessary dictionary for now 2020-11-13 14:42:41 +09:00
smoogipoo
35329aa976 Reduce the number of state updates 2020-11-13 14:33:23 +09:00
Dean Herbert
0985cb3327 Fix perform from menu not hiding overlays if already on target screen 2020-11-13 14:08:08 +09:00
Dean Herbert
a2c81a3a52 Add back setting to toggle "always play first combo break" 2020-11-13 13:42:00 +09:00
Dean Herbert
4b5743d993 Fix combo break sound not playing after rewind 2020-11-13 13:38:14 +09:00
Dean Herbert
43626573df Fix combo break sounds playing when seeking 2020-11-13 13:36:19 +09:00
Dean Herbert
38105ed6a2
Merge branch 'master' into hitobject-pooling-base 2020-11-13 11:27:32 +09:00
Dean Herbert
030df8234a
Merge pull request #10805 from bdach/fix-osu-hd-mod-part-2
Fix slider ends not fading out after a rewind with hidden mod
2020-11-13 11:27:15 +09:00
kamp
66544544d3
Merge branch 'master' into allow-reversing-spinners 2020-11-13 00:40:49 +01:00
kamp
45ce6cc82d Allow spinners to be reversed 2020-11-13 00:36:47 +01:00
Bartłomiej Dach
967aeddf8a
Merge pull request #10810 from nbvdkamp/fix-editor-circle-stack-scale-crash
Prevent SelectionBox handles from appearing for stacks
2020-11-13 00:29:17 +01:00
kamp
1439c0f392 Prevent SelectionBox handles from appearing when a stack of circles is selected 2020-11-12 23:19:29 +01:00
Bartłomiej Dach
db5541d914
Merge pull request #10799 from nbvdkamp/add-accuracyheatmap-test
Add test for accuracy heatmap
2020-11-12 16:40:12 +01:00
Bartłomiej Dach
9e467f8812
Merge branch 'master' into add-accuracyheatmap-test 2020-11-12 15:50:48 +01:00
Bartłomiej Dach
73326d794c
Merge pull request #10793 from peppy/perform-from-menu-dialog-aware
Refactor "perform from menu" logic to be aware of dialog prompts
2020-11-12 15:50:08 +01:00
Dan Balasescu
2840fd0f8f
Merge branch 'master' into hitobject-pooling-base 2020-11-12 23:17:36 +09:00
Bartłomiej Dach
96fbfc33fa
Merge branch 'master' into perform-from-menu-dialog-aware 2020-11-12 15:05:45 +01:00
Bartłomiej Dach
aaad506b98
Merge pull request #10802 from smoogipoo/fix-dodgy-test
Fix skin fallback test crashing on repeats
2020-11-12 12:15:36 +01:00
Dan Balasescu
10c78459ab
Merge branch 'master' into fix-dodgy-test 2020-11-12 19:40:37 +09:00
Dan Balasescu
e804fe5458
Merge pull request #10801 from peppy/fix-legacy-legacy-storyboard-frame-delays
Fix storyboard animations of very old beatmaps playing too slow
2020-11-12 19:06:57 +09:00
smoogipoo
3f0a127196 Fix slider/spinner samples not being disposed 2020-11-12 18:51:58 +09:00
smoogipoo
0abda7b557 Merge branch 'hitobject-pooling-base' into osu-hitobject-pooling 2020-11-12 18:49:03 +09:00
smoogipoo
261ddd2b4a Fix samples not being disposed 2020-11-12 18:48:25 +09:00
smoogipoo
8aaa500431 Add lifetime extensions 2020-11-12 18:34:50 +09:00
smoogipoo
243e913e4a Add hitobject usage events 2020-11-12 18:32:20 +09:00
smoogipoo
fe347c8661 Add playfield support for keeping hitobjects alive 2020-11-12 18:30:32 +09:00
smoogipoo
7548db7ecc Fix hitobjects sometimes not fading in completely with HD mod 2020-11-12 18:29:22 +09:00
Andrei Zavatski
7177dd5d82 Add counter to most played beatmaps section in user overlay 2020-11-12 18:29:22 +09:00
Dean Herbert
8a2addbf3d Update framework 2020-11-12 18:29:22 +09:00
Bartłomiej Dach
1f83769bb2 Inline empty explosion in legacy transformer 2020-11-12 18:29:22 +09:00
Bartłomiej Dach
0d5cac89b3 Explicitly set lifetime to ensure empty drawables are cleaned up 2020-11-12 18:29:22 +09:00
Bartłomiej Dach
21709ba4bc Do not lookup default kiai explosion if skin has own 2020-11-12 18:29:22 +09:00