1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 03:47:26 +08:00
Commit Graph

32301 Commits

Author SHA1 Message Date
Dean Herbert
b34273fdab
Merge pull request #10260 from bdach/base-taiko-drawable-ruleset-scene
Extract base taiko drawable ruleset scene
2020-09-27 15:00:15 +09:00
Dean Herbert
03d9ce8c26
Merge branch 'master' into base-taiko-drawable-ruleset-scene 2020-09-27 14:33:06 +09:00
Dean Herbert
abc4f90c7d
Merge pull request #10259 from bdach/fix-taiko-test-visual-brokenness
Fix visual brokenness in taiko tests using DrawableTestHit
2020-09-27 14:23:28 +09:00
Bartłomiej Dach
b1e02db874 Extract base taiko drawable ruleset scene 2020-09-26 20:36:38 +02:00
Bartłomiej Dach
095686a320 Hide test hit directly in explosion scene 2020-09-26 17:26:26 +02:00
Bartłomiej Dach
b64e69fabd Add test hits to playfields directly where possible 2020-09-26 17:18:50 +02:00
Dean Herbert
1d1de59ecc
Merge pull request #10253 from smoogipoo/fix-hp-instafail
Fix HP drain edgecase potentially causing insta-fails
2020-09-26 16:29:10 +09:00
smoogipoo
9a24346a00 Fix HP drain edgecase potentially causing insta-fails 2020-09-25 23:29:40 +09:00
Dean Herbert
a72629437d
Merge pull request #10250 from smoogipoo/fix-taiko-crash
Fix potential taiko crash on rewind
2020-09-25 20:24:22 +09:00
Dan Balasescu
2280568d27
Merge pull request #10245 from peppy/editor-sample-addition-buttons
Add sample toggle buttons to toolbox
2020-09-25 20:09:10 +09:00
Dan Balasescu
93a137ed84
Merge pull request #10234 from peppy/editor-load-audio
Add audio track selection to editor setup screen
2020-09-25 19:58:23 +09:00
Dan Balasescu
d3aa66993d
Merge pull request #10248 from peppy/namespace-editor-ruleset-tests
Move all ruleset editor tests to their own namespace
2020-09-25 19:47:33 +09:00
Dan Balasescu
cc41b4bb9e
Merge branch 'master' into editor-sample-addition-buttons 2020-09-25 19:39:12 +09:00
smoogipoo
0853f0e128 Remove comment 2020-09-25 19:38:23 +09:00
smoogipoo
480eeb5fbe Add back caching 2020-09-25 19:37:34 +09:00
Dan Balasescu
f588cf459d
Merge pull request #10243 from peppy/editor-ternary-buttons
Add ternary toggle buttons to editor toolbox selection
2020-09-25 19:37:18 +09:00
smoogipoo
acfa62bb50 Fix potential taiko crash on rewind 2020-09-25 19:25:58 +09:00
Dan Balasescu
8c45786841
Merge pull request #10247 from peppy/fix-editor-missed-state-changes
Forcefully re-apply DrawableHitObject state transforms on post-load DefaultsApplied
2020-09-25 19:00:45 +09:00
Dan Balasescu
3f0c3fc9ae
Merge branch 'master' into editor-ternary-buttons 2020-09-25 18:57:10 +09:00
Dean Herbert
d25e058492
Merge branch 'master' into editor-load-audio 2020-09-25 18:52:05 +09:00
Dean Herbert
c41fb67e73 Move all ruleset editor tests to their own namespace 2020-09-25 18:51:26 +09:00
Dan Balasescu
af93b56c32
Merge pull request #10246 from peppy/update-framework
Update framework
2020-09-25 18:42:12 +09:00
Dean Herbert
8b255f4579 Fix test failures
The issue was the ArchiveModelManager change; the test local change is
just there because it makes more sense to run for every test in that
scene.
2020-09-25 18:40:22 +09:00
Dean Herbert
204024c76e Merge branch 'master' into editor-load-audio 2020-09-25 18:32:51 +09:00
Dean Herbert
8e6bf516d9
Merge branch 'master' into editor-ternary-buttons 2020-09-25 18:30:59 +09:00
Dean Herbert
8bbf15a096
Merge pull request #10239 from peppy/new-combo-toggle 2020-09-25 18:30:46 +09:00
Dean Herbert
59bfa08684 Forcefully re-apply DrawableHitObject state transforms on post-load DefaultsApplied 2020-09-25 18:26:54 +09:00
Dean Herbert
4cc02abc76 Update framework 2020-09-25 18:11:49 +09:00
Dean Herbert
dbfa05d3b3 Fix placement object not getting updated with initial state 2020-09-25 18:00:17 +09:00
Dean Herbert
b561429f92 Add toolbar toggle buttons for hit samples 2020-09-25 17:53:41 +09:00
Dean Herbert
346d14d40b Rename variables to match 2020-09-25 17:45:19 +09:00
Dean Herbert
22511c36c3 Ensure toggles are not instantiated more than once for safety 2020-09-25 17:43:09 +09:00
Dean Herbert
51cc644b7b
Fix set access to SelectionHandler
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2020-09-25 17:42:49 +09:00
Dan Balasescu
7b09f73fe5
Merge branch 'master' into new-combo-toggle 2020-09-25 17:33:12 +09:00
Dan Balasescu
ab03be5336
Merge pull request #10244 from peppy/editor-dont-block-keys-unnecessarily
Avoid consuming keystrokes in editor when a modifier key is held down
2020-09-25 17:31:53 +09:00
Dan Balasescu
e1fc8d76fb
Merge branch 'master' into editor-dont-block-keys-unnecessarily 2020-09-25 17:31:41 +09:00
Dan Balasescu
54557ac6a7
Merge pull request #10241 from peppy/editor-ternary-states
Rework ternary states to fix context menus not updating after already displayed
2020-09-25 17:31:30 +09:00
Dean Herbert
b8e9f19b92 Move common HitSampleInfo lookup to static method 2020-09-25 17:30:31 +09:00
Dean Herbert
98c6027352 Remove unused using 2020-09-25 17:07:58 +09:00
Dan Balasescu
9b29c9e185
Merge branch 'master' into editor-ternary-states 2020-09-25 16:58:15 +09:00
Dean Herbert
b70a20e7f1 Avoid consuming keystrokes in editor when a modifier key is held down 2020-09-25 16:56:39 +09:00
Dean Herbert
da820c815e Add shortcut keys to toolbox gorup titles 2020-09-25 16:46:06 +09:00
Dean Herbert
a6298c60eb Fix button spacing 2020-09-25 16:44:37 +09:00
Dean Herbert
ae68dcd962 Add ternary toggle buttons to editor toolbox selection 2020-09-25 16:38:12 +09:00
Dan Balasescu
039e1b2032
Merge pull request #10217 from peppy/fix-taiko-editor-type-stats
Fix changing rim/strong types in taiko editor not applying correctly
2020-09-25 15:43:43 +09:00
Dean Herbert
0f8551e9ea Merge branch 'editor-ternary-states' into new-combo-toggle 2020-09-25 15:36:33 +09:00
Dean Herbert
bac6515d09
Merge branch 'master' into editor-ternary-states 2020-09-25 15:35:52 +09:00
Dean Herbert
727ab98d22 Update taiko selection handler with new logic 2020-09-25 15:32:45 +09:00
Dean Herbert
a859fe78ee Expose update ternary state method and use better state determination function 2020-09-25 15:32:36 +09:00
Dean Herbert
50290f3cb4 Rework ternary states to fix context menus not updating after already displayed 2020-09-25 15:10:13 +09:00