Commit Graph

661 Commits

Author SHA1 Message Date
8d8d45a0c0 Add combo index display support 2020-09-29 17:26:54 +09:00
f16fc29071 Add combo colour display support 2020-09-29 17:26:54 +09:00
06ab33645e Merge branch 'master' into editor-implicit-autoplay 2020-09-28 16:43:08 +09:00
5cceb3c724 Merge pull request #10273 from peppy/editor-fix-missing-update-after-drag
Trigger a hitobject update after blueprint drag ends
2020-09-28 16:34:23 +09:00
d9ac5866b6 Merge branch 'editor-default-hit-sample' into editor-implicit-autoplay 2020-09-28 15:48:37 +09:00
a4e9c85333 Trigger a hitobject update after blueprint drag ends 2020-09-28 15:37:06 +09:00
0ae2266b82 Fix new placement hitobjects in the editor not getting the default sample added 2020-09-28 15:36:13 +09:00
1aa8b400d4 Avoid unnecessary object updates from SelectionHandlers 2020-09-28 15:33:49 +09:00
cc41b4bb9e Merge branch 'master' into editor-sample-addition-buttons 2020-09-25 19:39:12 +09:00
8e6bf516d9 Merge branch 'master' into editor-ternary-buttons 2020-09-25 18:30:59 +09:00
dbfa05d3b3 Fix placement object not getting updated with initial state 2020-09-25 18:00:17 +09:00
b561429f92 Add toolbar toggle buttons for hit samples 2020-09-25 17:53:41 +09:00
346d14d40b Rename variables to match 2020-09-25 17:45:19 +09:00
22511c36c3 Ensure toggles are not instantiated more than once for safety 2020-09-25 17:43:09 +09:00
51cc644b7b Fix set access to SelectionHandler
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2020-09-25 17:42:49 +09:00
b8e9f19b92 Move common HitSampleInfo lookup to static method 2020-09-25 17:30:31 +09:00
98c6027352 Remove unused using 2020-09-25 17:07:58 +09:00
ae68dcd962 Add ternary toggle buttons to editor toolbox selection 2020-09-25 16:38:12 +09:00
0f8551e9ea Merge branch 'editor-ternary-states' into new-combo-toggle 2020-09-25 15:36:33 +09:00
a859fe78ee Expose update ternary state method and use better state determination function 2020-09-25 15:32:36 +09:00
50290f3cb4 Rework ternary states to fix context menus not updating after already displayed 2020-09-25 15:10:13 +09:00
a6adf8334e Use existing method to update combo state of selection 2020-09-25 14:19:35 +09:00
e009264f10 Add new combo toggle to main composer interface 2020-09-25 14:10:30 +09:00
44be0ab762 Add basic osu! object to object snapping 2020-09-24 16:24:35 +09:00
ccb3ef5020 Merge branch 'new-combo-editor-toggle' into fix-taiko-change-handling 2020-09-23 17:08:27 +09:00
02201d0ec6 Fix incorrect cast logic 2020-09-23 17:08:25 +09:00
487fc2a2c6 Add missing change handler scopings to taiko context menu operations 2020-09-23 16:58:22 +09:00
2d67faeb72 Add xmldoc 2020-09-23 16:40:56 +09:00
a1ec167982 Add the ability to toggle new combo state from composer context menu 2020-09-23 16:38:16 +09:00
62c55165d4 Merge branch 'editor-fix-multiple-selection' into editor-clipboard 2020-09-14 15:47:20 +09:00
b7a06524fb Update comment to make more sense 2020-09-14 15:47:10 +09:00
75e4f224e5 Add back accidentally removed remove 2020-09-14 15:47:04 +09:00
81f30cd264 Select blueprint if object is already selected at the point of adding 2020-09-12 21:23:11 +09:00
94d929d8cd Remove unnecessary contains checks 2020-09-11 22:03:19 +09:00
22e6df02b6 Fix editor selected hitobjects containing the selection up to five times 2020-09-11 20:27:07 +09:00
c3123bf117 Rename drag blueprint selection method for discoverability 2020-09-08 17:22:59 +09:00
96f39dd350 Merge remote-tracking branch 'upstream/master' into visible-playfield-boundary 2020-09-05 01:50:13 -05:00
249ae5df1b Merge branch 'master' into beatmap-track-rework 2020-09-02 15:24:46 +09:00
d1f79a6a48 Fix potentially incorrect zoom level getting set on very short audio
track
2020-09-01 15:41:36 +09:00
f65991f31f Revert some usages based on review feedback 2020-08-26 23:28:58 +09:00
122265ff0e Revert non-track usage 2020-08-22 19:47:08 +09:00
70697cf1a0 Restore remaining editor components to use Beatmap.Track 2020-08-21 17:11:29 +09:00
0b0ff62647 Switch timeline to use track directly from beatmap again 2020-08-21 14:49:34 +09:00
070d71ec27 More cleanups 2020-08-12 00:48:38 +09:00
5002d69f69 Update inspections 2020-08-07 20:51:56 +09:00
61b632516e Ensure CurrentTrack is never null 2020-08-07 19:43:16 +09:00
5c05fe3988 Expose track from MusicController 2020-08-06 16:24:14 +09:00
6e42b8219c Move track to MusicController, compiles 2020-08-06 16:24:14 +09:00
288c0402ee Merge branch 'master' into editor-show-selected-count 2020-07-17 18:00:35 +09:00
b4b230288b Shift hue of selection handler box to not collide with blueprints 2020-07-17 17:51:39 +09:00