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
Dean Herbert
a3a9810344
Merge branch 'master' into editor-clock-cache
2020-05-23 00:44:04 +09:00
Dean Herbert
5ea33f4c04
Fix incorrect rounding in DragBar
2020-05-22 19:23:07 +09:00
Dean Herbert
d18eb663b1
Add tweening seek support to EditorClock
2020-05-22 16:47:52 +09:00
Dean Herbert
dd09d7830d
Cache and resolve editor clock as EditorClock in all cases
2020-05-22 16:44:06 +09:00
Dean Herbert
8a47e2431b
Move distance snap grid implementation to OsuHitObjectComposer
2020-05-21 17:13:22 +09:00
Dean Herbert
82d6549161
Pass down snap result and remove local TimeAt usage
2020-05-20 21:01:29 +09:00
Dean Herbert
23bf0d000e
Implement mania beat snapping support
2020-05-20 21:01:19 +09:00
Dean Herbert
ffb8d48fc3
Fix osu!mania editor placement regressions
2020-05-20 21:01:03 +09:00
Dean Herbert
c46bfc2532
Create SnapResult class to hold various snapping results
2020-05-20 21:00:47 +09:00
Dean Herbert
3354d48a38
Change snapping to be screen space coordinate based
2020-05-20 21:00:29 +09:00
smoogipoo
cebc0fc046
Attempt to fix multiple selection movements
2020-04-27 20:35:24 +09:00
smoogipoo
7f5a1d7f44
Merge branch 'master' into fix-mania-selection
2020-04-27 17:09:40 +09:00
smoogipoo
104c61d622
Remove unnecessary scale
2020-04-27 11:06:23 +09:00
Dean Herbert
48168dddce
Adjust editor timeline current marker to promote tick visibility
2020-04-27 10:54:32 +09:00
Dean Herbert
1c13fa6c61
Fix editor crashing when entering with no beatmap selected
2020-04-24 10:27:32 +09:00
smoogipoo
4ebb28d3e7
wip
2020-04-23 17:52:54 +09:00
smoogipoo
4a87ac7840
Add support for sample changes
2020-04-10 13:53:09 +09:00
smoogipoo
575b061dd7
Add change state support to more editor components
2020-04-09 22:02:42 +09:00
smoogipoo
683302a77d
Fix crash when trying to edit long beatmaps
2020-04-09 20:25:26 +09:00
Dean Herbert
aabcc78162
Merge branch 'master' into editor-song-end
2020-03-25 13:19:21 +09:00
voidedWarranties
b41f3f1cad
Fix seeking back to beginning too early
2020-03-23 22:37:53 -07:00
Fuewburvpoa
6c825eb744
Update osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
...
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-03-18 00:04:03 +02:00
Fuewburvpoa
bee8e22d18
Fix BeatDivisorControl allow to select value outside of VALID_DIVISORS
2020-03-17 22:27:11 +02:00
Dean Herbert
ed837d3115
Use framework extension method for FromHex
2020-03-11 10:18:41 +09:00
smoogipoo
6c28fd21c7
osu-side changes
2020-02-24 20:52:15 +09:00
smoogipoo
958c891d15
Update with framework-side bindable list changes
2020-02-17 15:06:14 +09:00
recapitalverb
c753cb46c5
Use [Resolved] wherever possible
2020-02-14 20:14:00 +07:00
Dean Herbert
0e439e3a70
Fix missing dependency in ZoomableScrollContainer test
2020-02-14 14:41:55 +09:00
Dan Balasescu
60d796ae3f
Merge branch 'master' into fix-timeline-seek-while-playing
2020-02-14 13:04:38 +09:00
Dan Balasescu
4b7a053544
Merge branch 'master' into update-placement-more-often
2020-02-13 18:43:27 +09:00
Dan Balasescu
c384e3cfc2
Merge branch 'master' into timeline-zoom-button-repeat
2020-02-13 18:04:36 +09:00
Dean Herbert
118f862342
Fix not being able to seek using scroll wheel in timeline while playing track
2020-02-13 12:03:50 +09:00
Dean Herbert
03bf10f9a2
Remove unused using statement
2020-02-13 11:15:00 +09:00
Dean Herbert
487dd47c9e
Add mouse down repeat support to timeline zoom buttons
2020-02-13 11:14:09 +09:00
Dean Herbert
e34a24a063
Update placement blueprint more often for better display
2020-02-13 10:45:16 +09:00
Dean Herbert
2b6f99d404
Standardise placement blueprint creation and destruction
2020-02-13 10:12:56 +09:00
Dean Herbert
b65e839bd2
Simplify blueprints by removing visible state
2020-02-13 10:00:09 +09:00
Dean Herbert
0fe41fd50a
Fix blueprint showing even when mouse outside of container
2020-02-13 09:03:48 +09:00
Dan Balasescu
28cf5c7a59
Add accessor
2020-02-10 14:28:43 +09:00
Dean Herbert
56a091674b
Add placement display to timeline
2020-02-07 18:04:10 +09:00
Dean Herbert
e31d69c749
Add commit status to EndPlacement; call BeginPlacement on initial movement
2020-02-07 18:02:48 +09:00
smoogipoo
6ae0efa40d
Fix adjustment not working when dragged before object
2020-02-06 14:47:43 +09:00
smoogipoo
c138e3907e
Move methods below ctor
2020-02-06 14:35:45 +09:00
Dean Herbert
f5edad16e6
Improve visuals
2020-02-05 19:43:13 +09:00
Dean Herbert
98ab1f9862
Fix negative spinners
2020-02-05 18:35:31 +09:00
Dean Herbert
3d42973764
Allow scrolling via drag while dragging a hold note handle
2020-02-05 18:35:31 +09:00
Dean Herbert
cef45afbc8
Add a simple hover state
2020-02-05 18:35:31 +09:00
Dean Herbert
d56accaef1
Disallow negative / zero repeat counts (and fix off-by-one)
2020-02-05 18:35:31 +09:00
Dean Herbert
d04cc0123d
Initial implementation of timeline blueprint dragbars
2020-02-05 18:35:31 +09:00
Dean Herbert
90caa61245
Reverse comparison for readability
...
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-02-01 02:05:26 +09:00
Dean Herbert
f51cfa2220
Fix too many ticks being displayed on beatmaps with multiple timing sections
...
Closes https://github.com/ppy/osu/issues/7681 .
2020-01-31 00:24:00 +09:00
Dan Balasescu
66b8d38d42
Merge branch 'master' into selection-composition-conformity
2020-01-29 16:52:45 +09:00
Dan Balasescu
e553a9b9e0
Merge branch 'master' into distance-snap-grid-correct-colouring
2020-01-29 16:09:35 +09:00
Dan Balasescu
63501c188a
Merge pull request #7644 from peppy/standardise-zoom-levels
...
Standardise editor timeline zoom across maps of all lengths
2020-01-29 16:04:25 +09:00
Dan Balasescu
0d6fd0a54a
Merge branch 'master' into standardise-zoom-levels
2020-01-29 15:32:57 +09:00
Dan Balasescu
65ac412ff8
Merge branch 'master' into fix-beat-snap
2020-01-29 15:32:27 +09:00
smoogipoo
391681b7af
Separate calculation to follow other examples
2020-01-29 15:16:48 +09:00
Dean Herbert
8e2159e4eb
Ensure selection tool correctly matches selection state
...
- When a selection is made (via the timeline) the selection tool should become the select tool.
- When the selection tool is changed to anything *but* the select tool, the selection should be cleared.
2020-01-28 15:13:12 +09:00
Dean Herbert
4bb33046ca
Standardise editor timeline zoom across maps of all lengths
2020-01-28 13:03:06 +09:00
Dean Herbert
58654f28b6
Fix beat snap implementation being incorrect
2020-01-28 12:48:24 +09:00
Dean Herbert
29daabb40a
Fix distance snap grid showing incorrect colouring
...
Now matches timeline colours (based on timing point).
2020-01-28 11:59:21 +09:00
Dean Herbert
d5fda053f4
Use centre origin/anchors
2020-01-27 18:09:54 +09:00
Dean Herbert
493390b750
Rename class to TimelineTickDisplay
2020-01-27 18:08:01 +09:00
Dean Herbert
084fa2f04a
Add timeline beat display
2020-01-27 17:38:50 +09:00
Dean Herbert
e24c4ab901
Adjust zoom defaults for timeline to be more useful
2020-01-27 17:34:40 +09:00
Dean Herbert
df665c3a3c
Move beat index colour retrieval to static function
2020-01-27 17:34:40 +09:00
smoogipoo
811ddb02a4
General refactoring
2020-01-24 17:50:36 +09:00
smoogipoo
28727bbafd
Fix crash when deselecting via ctrl+click
2020-01-24 17:30:37 +09:00
Dean Herbert
5646f7777e
Add comment about custom SelectionHandler
2020-01-23 16:23:42 +09:00
Dean Herbert
5cadbb1ffb
Move timeline blueprint to own class
2020-01-23 16:22:43 +09:00
Dean Herbert
9d90799447
Remove useless container
2020-01-23 16:20:42 +09:00
Dean Herbert
289be7a17b
Merge branch 'i-beat-snapping' into timeline-maybe
2020-01-23 15:45:33 +09:00
Dean Herbert
56c044c44a
Move beat snapping to its own interface
2020-01-23 14:30:25 +09:00
Dean Herbert
cb09c2e144
Add support for dragging outside visible extents
2020-01-23 14:30:25 +09:00
Dean Herbert
477e1b7d27
Rename TimelineHitObjectDisplay to TimelineBlueprintContainer
2020-01-23 14:30:25 +09:00
Dean Herbert
9d2a46df89
Add beat snapping to timeline movement
2020-01-23 14:30:25 +09:00
Dean Herbert
c76f76e5aa
Fix being able to drag out of the blueprint intending to be moved
2020-01-23 14:30:25 +09:00
Dean Herbert
aa1a226ab7
Remove unused ScreenSpaceStartPosition field
2020-01-23 14:30:25 +09:00
Dean Herbert
53bdf72592
Allow basic timeline selection temporal movement
2020-01-23 14:30:25 +09:00
Dean Herbert
cb6e7425ae
Make dragbox stateful to fix blueprint movement
2020-01-23 14:30:25 +09:00
Dean Herbert
f0d810fe20
Follow start time and duration changes
2020-01-23 14:30:08 +09:00
Dean Herbert
63cef8b8b7
Rename nested classes to be more appropriate
2020-01-23 14:30:08 +09:00
Dean Herbert
89d90fdfa0
Fix drag not updating until mouse is moved while scrolling timeline
2020-01-23 14:30:07 +09:00
Dean Herbert
a8ec4907c4
Fix selections while scrolling timeline
2020-01-23 14:27:21 +09:00
Dean Herbert
c4395b1cea
Clean up nested class implementations
2020-01-23 14:27:20 +09:00
Dean Herbert
482409e776
Colour extension bars of long objects
2020-01-23 14:26:33 +09:00
Dean Herbert
a6775d1bd3
Implement custom drag box and allow drag seeking once again
2020-01-23 14:26:33 +09:00
Dean Herbert
8a7f7c5e46
Merge remote-tracking branch 'smoogipoo/void-key-up-returns' into update-framework
2020-01-22 22:57:56 +09:00
Dean Herbert
7c62cc3ac3
Merge remote-tracking branch 'smoogipoo/void-mouse-up-returns' into update-framework
2020-01-22 22:57:52 +09:00
smoogipoo
7b2f58eb30
Apply OnRelease method signature refactorings
2020-01-22 13:22:34 +09:00
Dean Herbert
e3a2b20f63
Fix SelectionHandler visibility on remote selection
2020-01-22 01:32:11 +09:00
Dean Herbert
83fa4a9bb3
Move circle size to a constant
2020-01-21 22:24:04 +09:00
Dean Herbert
a963d652bc
Mark readonly
2020-01-21 20:54:50 +09:00
Dean Herbert
c88bdbd4a0
Share selected hitobjects across multiple blueprint containers
2020-01-21 20:46:39 +09:00
Dean Herbert
1ce78afa98
Disable y offset for now
2020-01-21 19:51:44 +09:00
Dean Herbert
f582c42bbd
Perform deletion directly via EditorBeatmap
2020-01-21 18:56:09 +09:00
Dean Herbert
a888d148b6
Remove remaining cast
2020-01-21 18:01:10 +09:00
Dean Herbert
6187b2e77c
Implement IDistanceSnapProvider in timeline for now
2020-01-21 18:00:36 +09:00
Dean Herbert
353b74b04a
Handle selection events in timeline
2020-01-21 17:37:35 +09:00
Dean Herbert
8f16c1cb04
Add non-hiding selection state
2020-01-21 14:21:00 +09:00
Dean Herbert
53fe0ce790
Use AliveChildren
2020-01-21 14:20:52 +09:00
Dean Herbert
bd96cf94a6
Begin refactoring SelectionBlueprint to handle non-drawable HitObjects
2020-01-21 12:47:14 +09:00
smoogipoo
40f502c6d1
Apply input method signature refactorings
2020-01-20 19:35:37 +09:00
smoogipoo
bfb056c612
Apply input method signature refactorings
2020-01-20 18:17:21 +09:00
Dean Herbert
25aff5d96e
Merge remote-tracking branch 'upstream/master' into decouple-blueprint-container
2020-01-20 17:08:59 +09:00
smoogipoo
9535b3eeba
Fix possible nullref on blueprint removal
2020-01-16 12:00:36 +09:00
smoogipoo
5f178b7755
General refactorings
2020-01-16 11:54:03 +09:00
Dean Herbert
d57f55f053
Apply remaining changes required to restore previous functionality
2020-01-15 19:09:49 +09:00
smoogipoo
91735ff367
Update MathUtils namespace usages
2020-01-09 13:43:44 +09:00
Dean Herbert
d8d12cbbdd
wip: Move more functionality into ComposeBlueprintContainer
2020-01-02 19:09:37 +09:00
Dean Herbert
ee332e0d42
Split out BlueprintContainer functionality further
2020-01-02 18:21:16 +09:00
smoogipoo
8c378dc625
Move EditorBeatmap construction/conversion to Editor
2019-12-30 14:51:14 +09:00
smoogipoo
94a298a82d
Refactor distance snap grid to not require hitobjects
2019-12-10 16:00:09 +09:00
Dean Herbert
9248fbe881
Remove extra checkboxes for now
2019-12-06 12:22:44 +09:00
Dean Herbert
28400aa865
Update test scene
2019-12-06 11:27:24 +09:00
Dean Herbert
12a9843835
Move thickness to a constant
2019-12-06 10:48:18 +09:00
Dean Herbert
e76f8bdd64
Fix warnings
2019-12-05 23:31:21 +09:00
Dean Herbert
d8620a70fb
Make work in editor
2019-12-05 20:12:25 +09:00
Dean Herbert
e225b0032a
Add basic hitobject display to timeline
2019-12-05 19:31:40 +09:00
Dean Herbert
709ec1404f
Centralise End/StartTime retrieval to extension method
2019-11-25 19:09:14 +09:00
Berkan Diler
fccdbffa93
Use MathF instead of Math- functions when possible
...
MathF-functions are faster than the Math-counterpart and it looks cleaner, so use MathF when we cast to float or int anyway.
2019-11-25 00:45:42 +01:00
Dean Herbert
201f32859a
Merge branch 'master' into slider-control-point-removal
2019-11-21 22:10:52 +09:00
Berkan Diler
6cab517b2d
.NET Standard 2.1 implements Math.Clamp , use it instead of MathHelper.Clamp from osuTK.
2019-11-20 13:37:47 +01:00
smoogipoo
76ab0ecd3c
Disallow deselections with right clicks
2019-11-13 17:21:55 +09:00
Dean Herbert
4b66ce0c52
Merge branch 'master' into slider-controlpoint-addition
2019-11-12 18:13:27 +09:00
Dean Herbert
dd196385cb
Add Ctrl+A to select all and Escape to deselect all ( #6803 )
...
Add Ctrl+A to select all and Escape to deselect all
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-11-12 18:10:45 +09:00
Dean Herbert
cdd87a6903
Merge branch 'master' into delete-selection
2019-11-12 17:59:43 +09:00
smoogipoo
10fd5ef5a7
Merge context menus
2019-11-12 15:02:27 +09:00
Dean Herbert
b4525c1f6e
Fix right clicking to select not showing context menu
2019-11-12 14:42:30 +09:00
smoogipoo
9f1d490ac9
Only handle selection input on blueprints
2019-11-12 12:18:24 +09:00
Dean Herbert
a43b0ee01b
Apply naming and styling changes
2019-11-12 10:45:46 +09:00
Dean Herbert
b37bf4ea01
Merge remote-tracking branch 'upstream/master' into selection-hitsound-addition
2019-11-12 10:44:53 +09:00
smoogipoo
f3dc38e342
Add Ctrl+A to select all (esc to deselect all)
2019-11-11 13:41:10 +09:00
smoogipoo
97ea07db0e
Add delete option to the right-click menu
2019-11-08 19:44:47 +09:00
smoogipoo
998e1dfe47
Fix non-1/1 initial beat divisor control display
2019-11-08 17:23:47 +09:00
smoogipoo
df08a95734
Separate addition/removal into separate methods
2019-11-08 16:46:58 +09:00
smoogipoo
6fc1be64c2
Make hitobject samples a bindable list
2019-11-08 14:04:57 +09:00
smoogipoo
864b8db638
Use three states for the hitsound menu items
2019-11-08 13:52:36 +09:00
smoogipoo
046f0b0fe5
Allow right-clicks to trigger selection
2019-11-08 13:40:47 +09:00
smoogipoo
573d11503e
Remove unused using
2019-11-08 13:36:17 +09:00
smoogipoo
abb3a6ca5b
Initial right click context menu implementation
2019-11-08 13:36:17 +09:00
Dean Herbert
70cf91fb40
Seek editor when hit objects are double clicked ( #6745 )
...
Seek editor when hit objects are double clicked
2019-11-06 19:22:41 +09:00
smoogipoo
3680e7c704
Seek editor when hit objects are double clicked
2019-11-06 18:15:57 +09:00
smoogipoo
2c1bfd62ef
Disallow selections to be moved outside of the playfield
2019-11-06 17:28:04 +09:00
smoogipoo
020b08b450
Initial implementation of limited distance snap
2019-11-06 15:27:48 +09:00
Dean Herbert
52dba69a64
Implement slider control point deletion ( #6679 )
...
Implement slider control point deletion
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-11-05 19:15:15 +09:00
Dean Herbert
f4b93ec943
Add exception when holding control
2019-11-05 18:29:08 +09:00
Dean Herbert
f77de7d880
Simplify implementation
2019-11-05 18:25:38 +09:00
smoogipoo
0db34a47f8
Fix selecting underneath selected blueprints
2019-11-05 17:28:42 +09:00
smoogipoo
7c20a589f2
Remove unused usings
2019-11-05 13:56:21 +09:00
smoogipoo
c8beb5296f
Use PlatformAction.Delete instead of Delete key
2019-11-05 13:26:44 +09:00
Dan Balasescu
3692846367
Merge branch 'master' into snapping-refactor
2019-10-25 18:26:14 +09:00
smoogipoo
ae011e8ee8
Fix distance snap grid test scenes
2019-10-25 17:25:46 +09:00
smoogipoo
4ca6a5a0cc
Interface the distance snap provider
2019-10-25 16:50:21 +09:00
smoogipoo
607b4d874a
Refactor flow of snapping through HitObjectComposer
2019-10-25 16:40:30 +09:00
Dean Herbert
0b3c7f28af
Merge branch 'master' into fix-dragbox-first-frame
2019-10-24 23:01:32 +09:00
Dean Herbert
fa3350ce2d
Refactor blueprint movement and selection events ( #6588 )
...
Refactor blueprint movement and selection events
2019-10-24 22:58:03 +09:00
smoogipoo
a969914d6e
Mention coordinate space
2019-10-24 18:24:22 +09:00
smoogipoo
d83b9ef0e4
Rename grid snapping methods
2019-10-24 18:18:04 +09:00
smoogipoo
f45f17339c
Implement slider path distance snapping
2019-10-24 18:17:30 +09:00
smoogipoo
7a71352684
Fix drag box being positioned incorrectly for 1 frame
2019-10-24 17:22:14 +09:00
smoogipoo
fb88001c0e
Reorder blueprint addition/removal + add regions
2019-10-24 16:53:34 +09:00
smoogipoo
45bd91f63f
Add special cases for click-selection
2019-10-24 16:14:29 +09:00
smoogipoo
8e4a21bee7
Separate out mouse down/click/up handling
2019-10-24 15:58:22 +09:00
smoogipoo
a07e5a269b
Extract drag events into multiple methods
2019-10-24 15:33:08 +09:00
smoogipoo
f128e99fb2
Remove unused methods
2019-10-24 15:07:04 +09:00
smoogipoo
e04c77178c
Move selection events to BlueprintContainer
2019-10-24 14:58:02 +09:00
smoogipoo
714c89faa4
Move selection drag events to BlueprintContainer
2019-10-24 14:57:58 +09:00
smoogipoo
cef2318cf5
Move drag box drag handling to BlueprintContainer
2019-10-23 18:38:06 +09:00
Dean Herbert
f61d7e4fbe
Add smoothing and tidy code a touch
2019-10-23 17:56:09 +09:00
smoogipoo
c9fec50f63
Remove unnecessary whitespace
2019-10-23 17:00:17 +09:00
smoogipoo
97383b4a37
Show centre point of distance snap grid
2019-10-23 16:58:56 +09:00
Dean Herbert
0bf35faae8
Update incorrect reference
2019-10-21 19:25:56 +09:00
Dean Herbert
e3fa5f1da3
Merge branch 'master' into beatsnap-grid-integration
2019-10-21 18:44:34 +09:00
Dean Herbert
b157aaead1
Merge remote-tracking branch 'upstream/master' into beatsnap-grid-integration
2019-10-21 17:09:43 +09:00
smoogipoo
38c2c328ff
Rename HitObject -> DrawableObject in selection blueprints
2019-10-21 17:04:56 +09:00
smoogipoo
fc7e4680a7
Split on multiple lines
2019-10-21 14:08:28 +09:00
smoogipoo
463079e148
Implement placement snapping
2019-10-18 13:48:59 +09:00
smoogipoo
ba4402207a
Implement selection time snapping
2019-10-18 12:53:38 +09:00
smoogipoo
1dc7c59853
Implement selection position snapping
2019-10-18 12:53:27 +09:00
smoogipoo
bc76a9cb8c
Expose selection changed event from BlueprintContainer
2019-10-18 12:40:27 +09:00
smoogipoo
c5ee533524
Merge branch 'dho-apply' into beatsnap-grid-integration
2019-10-18 12:38:29 +09:00
smoogipoo
510ce9345f
Fix potential blueprint nullrefs with the new structure
2019-10-17 16:14:28 +09:00
Dean Herbert
f92331531c
Rename grid to DistanceSnap to be more in line with its purpose
2019-10-17 15:32:02 +09:00
smoogipoo
b6b8098b98
Add an arbitrary offset to prevent div-by-0
2019-10-16 19:44:53 +09:00
smoogipoo
2d4b7dc361
Remove redundant code
2019-10-16 19:33:18 +09:00
smoogipoo
5ac5e34f85
Use a cleaner distance function
2019-10-16 19:32:45 +09:00
Dean Herbert
f3c38ae089
Merge branch 'master' into osu-beatsnapping-grid
2019-10-13 18:38:57 +09:00
Dean Herbert
00f0957cc3
Merge branch 'master' into editor-grids-2
2019-10-12 23:28:51 +09:00
smoogipoo
45835f97a1
Split out grids into separate files
2019-10-11 18:41:17 +09:00
smoogipoo
050d86a741
Always use the local coordinate space
2019-10-11 18:24:33 +09:00
smoogipoo
9ecec806c2
Rename grid creation method + parameter
2019-10-11 18:24:33 +09:00
smoogipoo
5f0cd356d7
Rename startPosition to centrePosition
2019-10-11 18:24:33 +09:00
smoogipoo
8fb2628f9e
Improve xmldocs
2019-10-11 18:24:33 +09:00
smoogipoo
66e0fef85b
Expose StartPosition for derived grids to use
2019-10-11 18:24:33 +09:00
smoogipoo
97d4a8e59e
Remove unnecessary dependency
2019-10-11 18:24:33 +09:00
smoogipoo
2df519ddfa
Simplify colour retrieval function
2019-10-11 18:24:33 +09:00
smoogipoo
2aa3d0bb39
Implement base class for beat snapping grids
2019-10-11 18:24:33 +09:00
smoogipoo
179656788d
Remove unnecessary method
2019-10-08 19:27:59 +09:00
smoogipoo
c1db11fa06
More removal of "drag"
2019-10-08 19:24:58 +09:00
smoogipoo
8b661e624d
Remove drag from class/method namings + refactor
2019-10-08 19:08:31 +09:00
smoogipoo
08d043f447
Move selection relative to the hitobject start positions
2019-10-08 18:57:03 +09:00
smoogipoo
652acac87f
Move placement movement event to BlueprintContainer
2019-10-03 16:14:42 +09:00
smoogipoo
cbbc6aad6e
Make method static
2019-08-31 21:32:02 +09:00
smoogipoo
40729356fa
Move beat divisor colour retrieval to BindableBeatDivisor
2019-08-30 17:34:58 +09:00
smoogipoo
7927b684d3
Hook up + use editor beatmap
2019-08-29 16:06:40 +09:00
Dean Herbert
48716f8f2b
Update framework
2019-08-21 13:29:50 +09:00
Dean Herbert
1b75fbed9a
Merge remote-tracking branch 'upstream/master' into update-scrollcontainer
2019-06-14 23:25:17 +09:00
Dean Herbert
bc574520bf
Update ScrollContainer usages in line with framework changes
2019-06-14 15:55:32 +09:00
Dean Herbert
15b9b53d35
Fix IconButtons not being scaled correctly
2019-06-14 13:40:32 +09:00
Dan Balasescu
22940373a0
Merge branch 'master' into zoomablescrollcontainer-fix
2019-05-09 13:54:21 +09:00
smoogipoo
5c6b4d923f
Reorder methods
2019-05-09 13:53:53 +09:00