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

21376 Commits

Author SHA1 Message Date
kamp
4d2bc790fd Fix crash on shift+right-click deleting objects 2020-11-14 13:20:16 +01:00
Dean Herbert
354e748e45
Merge branch 'master' into osu-hitobject-pooling-playfield 2020-11-14 15:44:00 +09:00
Dean Herbert
52ff7b6593
Merge branch 'master' into hitobject-pooling-in-playfield 2020-11-14 10:27:12 +09: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
405407ff9e
Merge branch 'master' into fix-combo-break-sounds 2020-11-13 21:07:34 +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
403415147d
Merge branch 'master' into fix-perform-from-menu-overlay-hiding 2020-11-13 19:11:53 +01:00
smoogipoo
21b015d63a Remove explicit public 2020-11-14 01:06:38 +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
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
smoogipoo
832d52a056 Fix hitobject sample tests 2020-11-13 18:19:07 +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
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
a9fc7572ed Update framework 2020-11-13 15:33:27 +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
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
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
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
Dean Herbert
d9750fc043 Remove duplicate instantiation of externalLinkOpener 2020-11-12 18:29:22 +09:00
smoogipoo
a8c2b798ad Add support for nested hitobject pooling 2020-11-12 17:43:51 +09:00