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

34177 Commits

Author SHA1 Message Date
Bartłomiej Dach
f8cabbdd21 Clear result when freeing pooled hitobject 2020-11-14 21:09:22 +01:00
Bartłomiej Dach
5ae3d6cc74 Add failing asserts 2020-11-14 21:02:44 +01:00
Dean Herbert
aae59dc3cf
Merge pull request #10826 from smoogipoo/osu-hitobject-pooling-playfield
Change osu! ruleset to use pooled hitobjects
2020-11-14 18:37:23 +09:00
Dean Herbert
deea75b2e9 Fix typo in comment 2020-11-14 18:05:51 +09:00
Dean Herbert
7ac4d2c4be Move "drawable" to first prefix 2020-11-14 18:05:30 +09:00
Dean Herbert
90f37ff4ab Rejig namespaces 2020-11-14 18:04:59 +09:00
Dean Herbert
354e748e45
Merge branch 'master' into osu-hitobject-pooling-playfield 2020-11-14 15:44:00 +09:00
Dean Herbert
656a434da9
Merge pull request #10825 from smoogipoo/hitobject-pooling-in-playfield
Move hitobject pooling into Playfield
2020-11-14 15:43:23 +09:00
Dean Herbert
52ff7b6593
Merge branch 'master' into hitobject-pooling-in-playfield 2020-11-14 10:27:12 +09:00
Dean Herbert
e778a537c2
Merge pull request #10828 from bdach/disable-hold-note-logic-during-rewind
Disable pressed/released hold note logic when rewinding
2020-11-14 10:05:47 +09:00
Bartłomiej Dach
b9b47349ad
Merge pull request #10818 from peppy/fix-combo-break-rewind-replay
Fix combo break sound not playing a second time after rewinding before it
2020-11-13 22:26:17 +01:00
Bartłomiej Dach
d55eae55ad
Merge branch 'master' into fix-combo-break-rewind-replay 2020-11-13 21:46:32 +01:00
Bartłomiej Dach
1482b26a94
Merge pull request #10817 from peppy/fix-combo-break-sounds
Fix combo break sounds playing during seek
2020-11-13 21:46:03 +01:00
Bartłomiej Dach
405407ff9e
Merge branch 'master' into fix-combo-break-sounds 2020-11-13 21:07:34 +01:00
Bartłomiej Dach
ae1a5b8955
Merge pull request #10819 from peppy/add-always-play-combo-break-setting
Add back setting to toggle "always play first combo break"
2020-11-13 21:07:05 +01:00
Bartłomiej Dach
7a89e58483 Disable pressed/released action logic when rewinding 2020-11-13 20:49:06 +01:00
Bartłomiej Dach
e6300f25d4
Merge branch 'master' into add-always-play-combo-break-setting 2020-11-13 20:25:55 +01:00
Bartłomiej Dach
fc7b0cdced
Merge pull request #10812 from nbvdkamp/allow-reversing-spinners
Allow spinners to be reversed
2020-11-13 20:25:21 +01:00
Bartłomiej Dach
3985fb1fa7
Merge branch 'master' into allow-reversing-spinners 2020-11-13 19:48:40 +01:00
Bartłomiej Dach
266d189347
Merge pull request #10820 from peppy/fix-perform-from-menu-overlay-hiding
Fix perform from menu not hiding overlays if already on target screen
2020-11-13 19:47:13 +01:00
Bartłomiej Dach
403415147d
Merge branch 'master' into fix-perform-from-menu-overlay-hiding 2020-11-13 19:11:53 +01:00
Dean Herbert
e5daac41be
Merge pull request #10827 from smoogipoo/fix-broken-test
Fix broken fail judgement test
2020-11-14 02:25:57 +09:00
smoogipoo
b4470b0152 Merge branch 'fix-broken-test' into osu-hitobject-pooling-playfield 2020-11-14 01:50:13 +09:00
smoogipoo
b4d4f5456c Fix broken fail judgement test 2020-11-14 01:49:48 +09:00
smoogipoo
21b015d63a Remove explicit public 2020-11-14 01:06:38 +09:00
smoogipoo
5b60f32c7f Move implementation into OsuPlayfield 2020-11-14 01:03:23 +09:00
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