Commit Graph

34149 Commits

Author SHA1 Message Date
656a434da9 Merge pull request #10825 from smoogipoo/hitobject-pooling-in-playfield
Move hitobject pooling into Playfield
2020-11-14 15:43:23 +09:00
52ff7b6593 Merge branch 'master' into hitobject-pooling-in-playfield 2020-11-14 10:27:12 +09:00
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
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
d55eae55ad Merge branch 'master' into fix-combo-break-rewind-replay 2020-11-13 21:46:32 +01:00
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
405407ff9e Merge branch 'master' into fix-combo-break-sounds 2020-11-13 21:07:34 +01:00
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
7a89e58483 Disable pressed/released action logic when rewinding 2020-11-13 20:49:06 +01:00
e6300f25d4 Merge branch 'master' into add-always-play-combo-break-setting 2020-11-13 20:25:55 +01:00
fc7b0cdced Merge pull request #10812 from nbvdkamp/allow-reversing-spinners
Allow spinners to be reversed
2020-11-13 20:25:21 +01:00
3985fb1fa7 Merge branch 'master' into allow-reversing-spinners 2020-11-13 19:48:40 +01:00
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
403415147d Merge branch 'master' into fix-perform-from-menu-overlay-hiding 2020-11-13 19:11:53 +01:00
e5daac41be Merge pull request #10827 from smoogipoo/fix-broken-test
Fix broken fail judgement test
2020-11-14 02:25:57 +09:00
b4d4f5456c Fix broken fail judgement test 2020-11-14 01:49:48 +09:00
21b015d63a Remove explicit public 2020-11-14 01:06:38 +09:00
c71b237c4f Merge all pooling support into Playfield 2020-11-14 00:59:08 +09:00
36f1833f6e Move hitobject pooling to Playfield 2020-11-14 00:41:18 +09:00
f093acc9d5 Merge pull request #10823 from smoogipoo/pooling-editor-support
Add pooling support to the editor
2020-11-13 19:58:46 +09:00
d83b479c81 Internalise lifetime extensions and events too 2020-11-13 19:21:45 +09:00
4a4219fd11 Add region 2020-11-13 19:21:45 +09:00
92189e35cc Make playfield KeepAlive methods internal 2020-11-13 19:21:45 +09:00
742a140462 Merge branch 'master' into allow-reversing-spinners 2020-11-13 11:08:56 +01:00
864e4006b9 Fix timeline test 2020-11-13 17:51:01 +09:00
df7032bc6c Merge pull request #10803 from smoogipoo/nested-hitobject-pooling
Add nested hitobject pooling
2020-11-13 17:34:10 +09:00
688a442fb3 Add missing dictionary 2020-11-13 17:26:46 +09:00
942ecde0e1 Merge branch 'master' into pooling-editor-support 2020-11-13 17:23:35 +09:00
0219aff7bc Add timeline visible range adjustment 2020-11-13 17:10:29 +09:00
8268b33392 Merge pull request #10822 from peppy/update-framework
Update framework
2020-11-13 17:10:07 +09:00
3957697c48 Add pooling support to the editor 2020-11-13 17:08:20 +09:00
4ef2e9548c Pass HitObjectComposer to BlueprintContainer via ctor 2020-11-13 16:59:37 +09:00
06fd0d08d1 Merge branch 'master' into nested-hitobject-pooling 2020-11-13 16:53:20 +09:00
8b2f7434a6 Merge pull request #10797 from smoogipoo/hitobject-pooling-base
Implement top-level hitobject pooling
2020-11-13 16:52:06 +09:00
a9fc7572ed Update framework 2020-11-13 15:33:27 +09:00
4236dd826d Improve documentation and make abstract again 2020-11-13 14:57:09 +09:00
a07d4a7915 Remove unnecessary dictionary for now 2020-11-13 14:42:41 +09:00
35329aa976 Reduce the number of state updates 2020-11-13 14:33:23 +09:00
0985cb3327 Fix perform from menu not hiding overlays if already on target screen 2020-11-13 14:08:08 +09:00
a2c81a3a52 Add back setting to toggle "always play first combo break" 2020-11-13 13:42:00 +09:00
4b5743d993 Fix combo break sound not playing after rewind 2020-11-13 13:38:14 +09:00
43626573df Fix combo break sounds playing when seeking 2020-11-13 13:36:19 +09:00
38105ed6a2 Merge branch 'master' into hitobject-pooling-base 2020-11-13 11:27:32 +09:00
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
66544544d3 Merge branch 'master' into allow-reversing-spinners 2020-11-13 00:40:49 +01:00
45ce6cc82d Allow spinners to be reversed 2020-11-13 00:36:47 +01:00
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
1439c0f392 Prevent SelectionBox handles from appearing when a stack of circles is selected 2020-11-12 23:19:29 +01:00
db5541d914 Merge pull request #10799 from nbvdkamp/add-accuracyheatmap-test
Add test for accuracy heatmap
2020-11-12 16:40:12 +01:00
9e467f8812 Merge branch 'master' into add-accuracyheatmap-test 2020-11-12 15:50:48 +01:00