Dan Balasescu
|
8a768669ad
|
Merge pull request #10606 from FamousPig/fix-timeline-drag-select-weirdness
Fix timeline zoom during drag-select causing unexpected behaviour
|
2020-11-02 13:04:26 +09:00 |
|
Dan Balasescu
|
5ae3da9399
|
Merge branch 'master' into fix-timeline-drag-select-weirdness
|
2020-11-02 11:18:37 +09:00 |
|
Bartłomiej Dach
|
432282e8de
|
Use alternative solution to avoid storing last zoom
|
2020-11-01 21:25:05 +01:00 |
|
Dean Herbert
|
1f8d627af4
|
Merge branch 'master' into shift-delete-all-selected
|
2020-11-01 23:03:01 +09:00 |
|
Bartłomiej Dach
|
007c27d3ff
|
Schedule visibility update once per frame
|
2020-10-31 14:45:11 +01:00 |
|
Bartłomiej Dach
|
d74c19e2d7
|
Shorten show/hide code
|
2020-10-31 13:54:02 +01:00 |
|
Bartłomiej Dach
|
3322b8a7ea
|
Run OnSelectionChanged() on each change
|
2020-10-31 13:54:02 +01:00 |
|
Bartłomiej Dach
|
003994ab75
|
Bind UpdateVisibility() directly to source of truth
|
2020-10-31 13:54:02 +01:00 |
|
Bartłomiej Dach
|
129b1bc6d3
|
Delete all selected objects if shift-clicked on one
|
2020-10-31 11:46:25 +01:00 |
|
Bartłomiej Dach
|
202fe09306
|
Group selection actions back up in SelectionHandler
|
2020-10-28 22:06:48 +01:00 |
|
Leon Gebler
|
983a2774e8
|
Code Formatting
|
2020-10-27 15:09:10 +01:00 |
|
Leon Gebler
|
064c50c3ac
|
Expose currentZoom to fix selection box wiggle
|
2020-10-27 14:38:35 +01:00 |
|
Dean Herbert
|
3c2e2f29bc
|
Remove unused using statement
|
2020-10-27 13:17:44 +09:00 |
|
Dean Herbert
|
27c1a4c4d3
|
Move right-click deletion logic to be handled at a SelectionBlueprint level
|
2020-10-27 12:53:54 +09:00 |
|
Bartłomiej Dach
|
3f8c4c57d0
|
Fix code style issues & restructure
|
2020-10-26 22:16:28 +01:00 |
|
Charlie
|
255bb9d100
|
fixed issue with returns
|
2020-10-26 14:52:59 -05:00 |
|
Charlie
|
ccaf6560ec
|
formatting
|
2020-10-26 14:30:37 -05:00 |
|
Charlie
|
1239670566
|
moved right click shift delete functionality to HandleSelectionRequested + reduced func size
|
2020-10-26 14:28:53 -05:00 |
|
Charlie
|
ead3c19567
|
added function so circle is deleted when shift+right click
|
2020-10-26 13:40:42 -05:00 |
|
Leon Gebler
|
704f8cc4f2
|
Fix selection box wandering off into the distance
|
2020-10-26 18:45:03 +01:00 |
|
Dean Herbert
|
8273715bde
|
Merge pull request #9484 from FlashyReese/visible-playfield-boundary
|
2020-10-20 19:43:41 +09:00 |
|
Dean Herbert
|
22bde43106
|
Merge branch 'master' into visible-playfield-boundary
|
2020-10-19 18:05:28 +09:00 |
|
Dean Herbert
|
79a17b2371
|
Reapply waveform colour fix
|
2020-10-19 16:57:08 +09:00 |
|
Dean Herbert
|
88f74921fb
|
Update with new r# inspections
|
2020-10-16 12:49:39 +09:00 |
|
Dean Herbert
|
b0f8a7794a
|
Make SelectionHandler require EditorBeatmap presence
|
2020-10-09 21:44:10 +09:00 |
|
Dean Herbert
|
681e88af40
|
Merge branch 'master' into editor-fix-button-states-after-paste
|
2020-10-09 20:51:09 +09:00 |
|
Dan Balasescu
|
ecfb7e94c5
|
Merge branch 'master' into fix-editor-batch-handling
|
2020-10-09 20:06:06 +09:00 |
|
Dan Balasescu
|
07f19342d1
|
Merge pull request #10428 from peppy/editor-reset-newcombo-on-placement
Reset new combo button state after successful placement
|
2020-10-09 19:48:47 +09:00 |
|
Dan Balasescu
|
bcc096ee49
|
Merge pull request #10446 from peppy/fix-timeline-tick-bar-lines
Fix bar lines ("down beat" as people call it) showing up too often in timeline
|
2020-10-09 19:24:29 +09:00 |
|
Dan Balasescu
|
62690e4873
|
Merge pull request #10432 from peppy/editor-reverse-pattern
Add "reverse pattern" support to editor selection handler
|
2020-10-09 19:19:24 +09:00 |
|
Dean Herbert
|
3838f405dd
|
Fix missed usages
|
2020-10-09 18:50:05 +09:00 |
|
Dean Herbert
|
edaf6db5c6
|
Reference EditorBeatmap directly for selected objects
|
2020-10-09 18:44:23 +09:00 |
|
Dean Herbert
|
21c6242f90
|
Fix bar lines ("down beat" as people call it) showing up too often in timeline
|
2020-10-09 18:35:44 +09:00 |
|
Dean Herbert
|
5d888f687a
|
Account for the width of points so they don't suddenly appear at timeline edges
|
2020-10-09 16:49:51 +09:00 |
|
Dean Herbert
|
ceb1494c33
|
Only run regeneration when passing a new min/max tick boundary
|
2020-10-09 16:47:29 +09:00 |
|
Dean Herbert
|
017a8ce496
|
Only recalculate when display actually changes
|
2020-10-09 15:57:31 +09:00 |
|
Dean Herbert
|
9baf704942
|
Add local pooling to TimelineTickDisplay
|
2020-10-09 15:48:24 +09:00 |
|
Dean Herbert
|
825e10ec8c
|
Add reverse handler button to selection box
|
2020-10-09 06:32:23 +09:00 |
|
Dean Herbert
|
eacc7dca9a
|
Fix SliderPath not handling Clear correctly
|
2020-10-09 06:31:59 +09:00 |
|
Dean Herbert
|
85b33fffd0
|
Fix incorrect comments
|
2020-10-09 05:14:44 +09:00 |
|
Dean Herbert
|
5966205037
|
Fix ternary button states not updating correctly after a paste operation
|
2020-10-09 04:31:45 +09:00 |
|
Dean Herbert
|
e7eda19b07
|
Reset new combo button state after successful placement
|
2020-10-09 03:31:01 +09:00 |
|
Dean Herbert
|
afed832b19
|
Tidy up EditorBeatmap slightly
|
2020-10-08 18:06:49 +09:00 |
|
Dean Herbert
|
38babf3de5
|
Update usages of ChangeHandler to EditorBeatmap where relevant
|
2020-10-08 18:04:07 +09:00 |
|
Dean Herbert
|
ef092de9ba
|
Add missing UpdateHitObject calls and move local to usages (not via bindables)
|
2020-10-08 18:04:07 +09:00 |
|
Dan Balasescu
|
2ef5a34ace
|
Merge branch 'master' into editor-beatmap-batch-change-support
|
2020-10-07 14:08:49 +09:00 |
|
Dean Herbert
|
09f5e9c9eb
|
Use batch change application in many places that can benefit from it
|
2020-10-06 22:10:07 +09:00 |
|
Dean Herbert
|
a2796d2c01
|
Add repeats display to timeline blueprints
|
2020-10-06 19:22:35 +09:00 |
|
Dan Balasescu
|
783a463772
|
Merge branch 'master' into colourise-control-point-table
|
2020-10-05 20:47:06 +09:00 |
|
Dan Balasescu
|
54f1bcf2ce
|
Merge pull request #10313 from peppy/control-point-timeline-representation
Display all control point information on the main editor timeline
|
2020-10-05 20:46:52 +09:00 |
|
Dean Herbert
|
6bc0afdafb
|
Fix remaining conflicts
|
2020-10-05 20:09:18 +09:00 |
|
Dean Herbert
|
ba55256fb4
|
Merge branch 'master' into control-point-timeline-representation
|
2020-10-05 19:24:28 +09:00 |
|
Dan Balasescu
|
6d50a1ed7d
|
Merge branch 'master' into osu-selection-flip-rotate-buttons
|
2020-10-05 19:17:33 +09:00 |
|
Dan Balasescu
|
08f7b18dbe
|
Merge pull request #10294 from peppy/osu-selection-scaling
Add selection scale and rotate support
|
2020-10-05 19:17:19 +09:00 |
|
Dean Herbert
|
0d3a95d8fc
|
Remove unnecessary string interpolation
|
2020-10-02 19:54:13 +09:00 |
|
Dean Herbert
|
94996f2cc0
|
Merge branch 'master' into osu-selection-scaling
|
2020-10-01 21:09:52 +09:00 |
|
Dean Herbert
|
5ad2944e26
|
Fix ticks displaying higher than control point info
|
2020-10-01 19:31:41 +09:00 |
|
Dean Herbert
|
e96e30a19d
|
Move control point colour specifications to common location and use for formatting timing screen table
|
2020-10-01 19:29:34 +09:00 |
|
Dean Herbert
|
fcccce8b4e
|
Use pink for sample control points to avoid clash with waveform blue
|
2020-10-01 19:03:17 +09:00 |
|
Dean Herbert
|
589a26a149
|
Ensure stable display order for control points in the same group
|
2020-10-01 18:59:35 +09:00 |
|
Dean Herbert
|
b75c202a7e
|
Add sample control point display in timeline
|
2020-10-01 18:55:34 +09:00 |
|
Dean Herbert
|
0bced34272
|
Add visualisation of bpm (timing) changes to timeline
|
2020-10-01 18:55:34 +09:00 |
|
Dean Herbert
|
70931abcb0
|
Separate out timeline control point display from summary timeline display
|
2020-10-01 18:55:34 +09:00 |
|
Dean Herbert
|
70d475be1f
|
Fix elements appearing in front of hitobjects
|
2020-10-01 18:54:59 +09:00 |
|
Dean Herbert
|
00a19b4879
|
Also add toggle for ticks display
|
2020-10-01 18:16:49 +09:00 |
|
Dean Herbert
|
0d03084cdc
|
Move control point display to the base timeline class
We want them to display on all screens with a timeline as they are quite
useful in all cases.
|
2020-10-01 18:16:12 +09:00 |
|
Dean Herbert
|
60e6cfa45c
|
Avoid recreating child hierarchy when unnecessary
|
2020-10-01 16:36:03 +09:00 |
|
Dean Herbert
|
1aff263419
|
Split out classes and simplify construction of buttons
|
2020-10-01 16:34:34 +09:00 |
|
Dean Herbert
|
db1ad4243e
|
Remove need for ScaleDragHandle class
|
2020-10-01 16:27:42 +09:00 |
|
Dean Herbert
|
4e6a505a99
|
Add new icons and tooltips
|
2020-10-01 16:25:40 +09:00 |
|
Dean Herbert
|
78c5d57074
|
Add flip event flow and stop passing raw input events to handle methods
|
2020-10-01 16:25:29 +09:00 |
|
Dean Herbert
|
02f14ab4b0
|
Rename operation start/end to be more encompassing
|
2020-10-01 16:24:09 +09:00 |
|
Dean Herbert
|
b1f2bdd579
|
Add missing xmldoc
|
2020-10-01 13:47:49 +09:00 |
|
Dan Balasescu
|
7eb45990a4
|
Merge pull request #10302 from peppy/timing-screen-clean-up
Fix timing screen tests and add simple view of control points to timeline
|
2020-09-30 21:33:07 +09:00 |
|
Dean Herbert
|
3422db1bb2
|
Use top-left colour for deciding the text colour (gradient was added in some cases)
|
2020-09-30 17:10:22 +09:00 |
|
Dean Herbert
|
5b200a8ca4
|
Change default zoom of timing screen timeline to most zoomed out
|
2020-09-30 16:39:27 +09:00 |
|
Dean Herbert
|
ae9e884a48
|
Fix header casing
|
2020-09-30 15:35:25 +09:00 |
|
Dean Herbert
|
f1298bed79
|
Combine scale operations and tidy up scale drag handle construction
|
2020-09-30 15:08:56 +09:00 |
|
Dean Herbert
|
39b55a85df
|
Move a lot of the implementation to base SelectionHandler
|
2020-09-30 13:52:57 +09:00 |
|
Dean Herbert
|
f2c26c0927
|
Move information text underneath the selection box
|
2020-09-30 13:07:24 +09:00 |
|
Dean Herbert
|
a2e2cca396
|
Add proper change handler support
|
2020-09-29 20:08:56 +09:00 |
|
Dean Herbert
|
0a10e40ce0
|
Add scaling support to osu! editor
|
2020-09-29 20:08:56 +09:00 |
|
Dean Herbert
|
cd794eaa65
|
Add basic selection box with drag handles
|
2020-09-29 20:08:56 +09:00 |
|
Dean Herbert
|
6e1ea00443
|
Don't apply gradient to non-duration objects
|
2020-09-29 17:34:50 +09:00 |
|
Dean Herbert
|
c47652c97a
|
Add gradient to hide subtractive colour issues
Good thing is looks better than without.
|
2020-09-29 17:26:54 +09:00 |
|
Dean Herbert
|
8d8d45a0c0
|
Add combo index display support
|
2020-09-29 17:26:54 +09:00 |
|
Dean Herbert
|
f16fc29071
|
Add combo colour display support
|
2020-09-29 17:26:54 +09:00 |
|
Dan Balasescu
|
06ab33645e
|
Merge branch 'master' into editor-implicit-autoplay
|
2020-09-28 16:43:08 +09:00 |
|
Dan Balasescu
|
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 |
|
Dean Herbert
|
d9ac5866b6
|
Merge branch 'editor-default-hit-sample' into editor-implicit-autoplay
|
2020-09-28 15:48:37 +09:00 |
|
Dean Herbert
|
a4e9c85333
|
Trigger a hitobject update after blueprint drag ends
|
2020-09-28 15:37:06 +09:00 |
|
Dean Herbert
|
0ae2266b82
|
Fix new placement hitobjects in the editor not getting the default sample added
|
2020-09-28 15:36:13 +09:00 |
|
Dean Herbert
|
1aa8b400d4
|
Avoid unnecessary object updates from SelectionHandlers
|
2020-09-28 15:33:49 +09:00 |
|
Dan Balasescu
|
cc41b4bb9e
|
Merge branch 'master' into editor-sample-addition-buttons
|
2020-09-25 19:39:12 +09:00 |
|
Dean Herbert
|
8e6bf516d9
|
Merge branch 'master' into editor-ternary-buttons
|
2020-09-25 18:30:59 +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 |
|
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 |
|
Dean Herbert
|
ae68dcd962
|
Add ternary toggle buttons to editor toolbox selection
|
2020-09-25 16:38:12 +09:00 |
|
Dean Herbert
|
0f8551e9ea
|
Merge branch 'editor-ternary-states' into new-combo-toggle
|
2020-09-25 15:36:33 +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 |
|
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
|
44be0ab762
|
Add basic osu! object to object snapping
|
2020-09-24 16:24:35 +09:00 |
|
Dean Herbert
|
ccb3ef5020
|
Merge branch 'new-combo-editor-toggle' into fix-taiko-change-handling
|
2020-09-23 17:08:27 +09:00 |
|
Dean Herbert
|
02201d0ec6
|
Fix incorrect cast logic
|
2020-09-23 17:08:25 +09:00 |
|
Dean Herbert
|
487fc2a2c6
|
Add missing change handler scopings to taiko context menu operations
|
2020-09-23 16:58:22 +09:00 |
|
Dean Herbert
|
2d67faeb72
|
Add xmldoc
|
2020-09-23 16:40:56 +09:00 |
|
Dean Herbert
|
a1ec167982
|
Add the ability to toggle new combo state from composer context menu
|
2020-09-23 16:38:16 +09:00 |
|
Dean Herbert
|
62c55165d4
|
Merge branch 'editor-fix-multiple-selection' into editor-clipboard
|
2020-09-14 15:47:20 +09:00 |
|
Dean Herbert
|
b7a06524fb
|
Update comment to make more sense
|
2020-09-14 15:47:10 +09:00 |
|
Dean Herbert
|
75e4f224e5
|
Add back accidentally removed remove
|
2020-09-14 15:47:04 +09:00 |
|
Dean Herbert
|
81f30cd264
|
Select blueprint if object is already selected at the point of adding
|
2020-09-12 21:23:11 +09:00 |
|
Dean Herbert
|
94d929d8cd
|
Remove unnecessary contains checks
|
2020-09-11 22:03:19 +09:00 |
|
Dean Herbert
|
22e6df02b6
|
Fix editor selected hitobjects containing the selection up to five times
|
2020-09-11 20:27:07 +09:00 |
|
Dean Herbert
|
c3123bf117
|
Rename drag blueprint selection method for discoverability
|
2020-09-08 17:22:59 +09:00 |
|
Yao Chung Hu
|
96f39dd350
|
Merge remote-tracking branch 'upstream/master' into visible-playfield-boundary
|
2020-09-05 01:50:13 -05:00 |
|
Dean Herbert
|
249ae5df1b
|
Merge branch 'master' into beatmap-track-rework
|
2020-09-02 15:24:46 +09:00 |
|
Dean Herbert
|
d1f79a6a48
|
Fix potentially incorrect zoom level getting set on very short audio
track
|
2020-09-01 15:41:36 +09:00 |
|
Dean Herbert
|
f65991f31f
|
Revert some usages based on review feedback
|
2020-08-26 23:28:58 +09:00 |
|
Dean Herbert
|
122265ff0e
|
Revert non-track usage
|
2020-08-22 19:47:08 +09:00 |
|
Dean Herbert
|
70697cf1a0
|
Restore remaining editor components to use Beatmap.Track
|
2020-08-21 17:11:29 +09:00 |
|
Dean Herbert
|
0b0ff62647
|
Switch timeline to use track directly from beatmap again
|
2020-08-21 14:49:34 +09:00 |
|
smoogipoo
|
070d71ec27
|
More cleanups
|
2020-08-12 00:48:38 +09:00 |
|
smoogipoo
|
5002d69f69
|
Update inspections
|
2020-08-07 20:51:56 +09:00 |
|
smoogipoo
|
61b632516e
|
Ensure CurrentTrack is never null
|
2020-08-07 19:43:16 +09:00 |
|
smoogipoo
|
5c05fe3988
|
Expose track from MusicController
|
2020-08-06 16:24:14 +09:00 |
|
smoogipoo
|
6e42b8219c
|
Move track to MusicController, compiles
|
2020-08-06 16:24:14 +09:00 |
|
Dan Balasescu
|
288c0402ee
|
Merge branch 'master' into editor-show-selected-count
|
2020-07-17 18:00:35 +09:00 |
|
Dean Herbert
|
b4b230288b
|
Shift hue of selection handler box to not collide with blueprints
|
2020-07-17 17:51:39 +09:00 |
|
Dean Herbert
|
ea6f257dc2
|
Add a display of count of selected objects in editor
|
2020-07-17 17:48:27 +09:00 |
|
Dean Herbert
|
222a22182e
|
Fix double-click incorrectly firing across disparate targets
|
2020-07-17 17:03:57 +09:00 |
|
Yao Chung Hu
|
0d95b768aa
|
Rename and Move EditorPlayfieldBorder to PlayfieldBorder for general purpose
|
2020-07-10 07:34:48 -05:00 |
|
Dan Balasescu
|
fd9ac3503f
|
Merge branch 'master' into fix-editor-drag-selection-while-playing
|
2020-06-23 21:56:31 +09:00 |
|
smoogipoo
|
e7238e25f9
|
Fix exception when dragging after deleting object
|
2020-06-23 20:36:09 +09:00 |
|
Dean Herbert
|
a5eac716ec
|
Make work for all editors based on track running state
|
2020-06-23 18:42:56 +09:00 |
|
Dean Herbert
|
53d542546e
|
Fix editor drag selection not continuing to select unless the mouse is moved
|
2020-06-23 18:04:50 +09:00 |
|
Dean Herbert
|
abe07b742e
|
Fix drag scroll in editor timeline no longer working correctly
|
2020-06-14 13:20:58 +09:00 |
|
Dean Herbert
|
dd7dbfd548
|
Rename to IHasDuration
|
2020-05-29 16:45:47 +09:00 |
|
Dean Herbert
|
534dccc0c3
|
Move sett from EndTime to Duration
|
2020-05-29 16:45:47 +09:00 |
|
Dean Herbert
|
a2eec5d963
|
Fix strong bindable changes for DrumRolls
|
2020-05-29 16:45:47 +09:00 |
|
Dean Herbert
|
9a060cfb3a
|
Allow drag selections to occur from outside the playfield
|
2020-05-27 20:44:15 +09:00 |
|
Dean Herbert
|
7e1e26de2a
|
Allow HandleMovement by default
|
2020-05-26 17:04:31 +09:00 |
|
Dean Herbert
|
d041de63ce
|
Allow SelectionHandler to provide custom context menu items without local hover check
|
2020-05-26 13:53:09 +09:00 |
|
Dean Herbert
|
decdc58de5
|
Merge branch 'editor-clock-cache' into editor-clock-transform
|
2020-05-24 12:55:47 +09:00 |
|