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

34551 Commits

Author SHA1 Message Date
smoogipoo
5cbf6252b7 Merge branch 'hitobject-pooling-in-playfield' into osu-hitobject-pooling-playfield 2020-11-14 01:03:11 +09:00
smoogipoo
c71b237c4f Merge all pooling support into Playfield 2020-11-14 00:59:08 +09:00
smoogipoo
36f1833f6e Move hitobject pooling to Playfield 2020-11-14 00:41:18 +09:00
smoogipoo
d347493ba3 Merge branch 'master' into osu-hitobject-pooling 2020-11-13 23:13:09 +09:00
smoogipoo
9792d1fc73 Fix slider tests 2020-11-13 23:08:39 +09:00
smoogipoo
1e05fd48e2 Fix hidden mod crash 2020-11-13 23:08:27 +09:00
Dean Herbert
f093acc9d5
Merge pull request #10823 from smoogipoo/pooling-editor-support
Add pooling support to the editor
2020-11-13 19:58:46 +09:00
smoogipoo
d83b479c81 Internalise lifetime extensions and events too 2020-11-13 19:21:45 +09:00
smoogipoo
4a4219fd11 Add region 2020-11-13 19:21:45 +09:00
smoogipoo
92189e35cc Make playfield KeepAlive methods internal 2020-11-13 19:21:45 +09:00
kamp
742a140462
Merge branch 'master' into allow-reversing-spinners 2020-11-13 11:08:56 +01:00
smoogipoo
feabca860b Fix sample playback test 2020-11-13 18:35:33 +09:00
smoogipoo
832d52a056 Fix hitobject sample tests 2020-11-13 18:19:07 +09:00
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