1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-08 01:27:46 +08:00
Commit Graph

32254 Commits

Author SHA1 Message Date
Dan Balasescu
3f0c3fc9ae
Merge branch 'master' into editor-ternary-buttons 2020-09-25 18:57:10 +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
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
4cc02abc76 Update framework 2020-09-25 18:11:49 +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
Dan Balasescu
f1efc0ba42
Merge pull request #10240 from peppy/fix-setup-textbox-commit
Ensure setup screen text boxes commit on losing focus
2020-09-25 14:58:26 +09:00
Dan Balasescu
69d057a8b3
Merge branch 'master' into fix-taiko-editor-type-stats 2020-09-25 14:53:47 +09:00
Dan Balasescu
440adc305d
Merge pull request #10233 from peppy/file-selector
Add a basic file selector with extension filtering support
2020-09-25 14:44:32 +09:00
Dan Balasescu
d9fee594ea
Merge pull request #10238 from peppy/fix-hoc-keyboard-shortcut-hard-crash
Fix hard crash on hitting an out of range key (Q~P)
2020-09-25 14:44:14 +09:00
Dean Herbert
7f9a5f5f0d Ensure setup screen text boxes commit on losing focus 2020-09-25 14:25:24 +09:00
Dean Herbert
a6adf8334e Use existing method to update combo state of selection 2020-09-25 14:19:35 +09:00
Dean Herbert
e009264f10 Add new combo toggle to main composer interface 2020-09-25 14:10:30 +09:00
Dean Herbert
bca774a0d4 Allow BlueprintContainer to specify toggles 2020-09-25 14:09:31 +09:00
Dean Herbert
3c191cfe25 Add basic xmldoc to HitObjectComposer 2020-09-25 14:08:47 +09:00
Dan Balasescu
c273b9dcb3
Merge pull request #10231 from peppy/editor-object-object-snapping
Add editor object to object snapping
2020-09-25 13:52:33 +09:00
Dean Herbert
325bfdbf71 Fix hard crash on hitting an out of range key (Q~P) 2020-09-25 13:25:42 +09:00
Dan Balasescu
73ea527ec7
Merge pull request #10237 from peppy/fix-missing-headless-test
Fix missing HeadlessTest specification in new test
2020-09-25 13:19:38 +09:00
Dan Balasescu
952e84396a
Merge branch 'master' into editor-object-object-snapping 2020-09-25 13:17:30 +09:00
Dan Balasescu
ac0b47dae6
Merge pull request #10232 from peppy/fix-editor-screen-settings-remembering
Avoid destroying editor screens when changing between modes
2020-09-25 12:54:12 +09:00
Dean Herbert
c21745eb07 Fix missing HeadlessTest specification in new test 2020-09-25 12:43:41 +09:00
Dean Herbert
a8c85ed882 Add test for filtered mode 2020-09-25 12:42:37 +09:00
Dean Herbert
a890e5830d Add more file icons 2020-09-25 12:42:28 +09:00
Dean Herbert
1b8b417b85 Merge branch 'master' into file-selector 2020-09-25 12:33:18 +09:00
Dean Herbert
44a6637c36 Use SingleOrDefault 2020-09-25 12:20:37 +09:00
Dean Herbert
90c4c172bf Merge branch 'master' into fix-editor-screen-settings-remembering 2020-09-25 12:19:45 +09:00
Dean Herbert
8a0c79466d Use simplified methods for press/release key 2020-09-25 12:16:50 +09:00
Dean Herbert
b9196718b7 Merge branch 'master' into editor-object-object-snapping 2020-09-25 12:15:10 +09:00
Dean Herbert
dc85bcd470
Merge pull request #10229 from smoogipoo/fix-ruleset-disposal
Fix rulesets disposing game-wide texture store
2020-09-24 22:54:45 +09:00
Dean Herbert
937d5870b3 Add a basic file selector with extension filtering support 2020-09-24 20:54:25 +09:00
Dean Herbert
158d307126 Avoid destroying editor screens when changing between modes 2020-09-24 17:03:54 +09:00