Dean Herbert
|
ba55256fb4
|
Merge branch 'master' into control-point-timeline-representation
|
2020-10-05 19:24:28 +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
|
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
|
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 |
|