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
|
b654396a4c
|
Move ticks display to timeline
|
2020-10-01 18:16:30 +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 |
|
Dean Herbert
|
e0a0902a15
|
Ensure textbox always reverts to sane state on out-of-range failures
|
2020-10-01 13:06:24 +09:00 |
|
Bartłomiej Dach
|
10ae93cc2e
|
Merge branch 'master' into more-textbox-entry
|
2020-09-30 23:54:00 +02:00 |
|
Dan Balasescu
|
6def54548b
|
Merge branch 'master' into fix-control-point-bindable-updates
|
2020-09-30 21:35:36 +09:00 |
|
Dan Balasescu
|
6dab5c2ceb
|
Merge branch 'master' into fix-editor-silence-on-seek
|
2020-09-30 21:33:15 +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 |
|
Dan Balasescu
|
3af7e59103
|
Merge pull request #10289 from peppy/timeline-ux-improvements
Improve the usability of the editor timeline with combo colour and indices
|
2020-09-30 20:32:55 +09:00 |
|
Dean Herbert
|
fa742a2ef1
|
Update to consume framework fixes
|
2020-09-30 20:28:02 +09:00 |
|
Dean Herbert
|
a11c74d600
|
Update to consume framework fixes
|
2020-09-30 20:27:02 +09:00 |
|
Dean Herbert
|
5242f5648d
|
Fix timeline control point display not updating with changes
|
2020-09-30 18:34:13 +09:00 |
|
Dean Herbert
|
44fc0c6723
|
Fix default value of bpm being too high
|
2020-09-30 18:08:55 +09:00 |
|
Dean Herbert
|
bc943dee53
|
Add textbox entry for speed multiplier and volume
|
2020-09-30 17:52:12 +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
|
698042268f
|
Show control points in timing screen timeline
|
2020-09-30 17:00:42 +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
|
a40c2ea5ee
|
Simplify control point group binding/update logic
|
2020-09-30 16:02:22 +09:00 |
|
Dean Herbert
|
59ce9fcab9
|
Merge branch 'master' into fix-editor-silence-on-seek
|
2020-09-30 15:35:55 +09:00 |
|
Dean Herbert
|
ae9e884a48
|
Fix header casing
|
2020-09-30 15:35:25 +09:00 |
|
Dean Herbert
|
d6c88ecd69
|
Merge branch 'master' into osu-selection-scaling
|
2020-09-30 15:09:04 +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
|
1386c9fe66
|
Standardise time display formats across the editor
|
2020-09-30 12:45:43 +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 |
|
Dean Herbert
|
53b3d23842
|
Expose HitObjectComposer for other components in the Compose csreen to use
|
2020-09-29 17:26:54 +09:00 |
|
Dean Herbert
|
d6f3beffb6
|
Use existing bindable flow instead
|
2020-09-29 12:50:17 +09:00 |
|
Dean Herbert
|
585b857a0c
|
Handle paused state correctly
|
2020-09-29 12:17:38 +09:00 |
|
Dean Herbert
|
4f0c0ea5f9
|
Fix hit samples playing while paused / seeking in the editor
|
2020-09-28 18:17:47 +09:00 |
|
Dan Balasescu
|
2f5a2d3bba
|
Merge pull request #10277 from peppy/editor-implicit-autoplay
Add autoplay support to editor
|
2020-09-28 17:41:26 +09:00 |
|
Dan Balasescu
|
89c8fca3fa
|
Merge pull request #10270 from peppy/editor-fix-noop-states-saving
Avoid saving state changes if nothing has changed (via binary comparison)
|
2020-09-28 17:03:50 +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
|
7949eabaac
|
Remove left-over using
|
2020-09-28 15:49:45 +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 |
|
Dean Herbert
|
3cf430f494
|
Avoid saving state changes if nothing has changed (via binary comparison)
|
2020-09-28 15:30:51 +09:00 |
|
Dan Balasescu
|
2280568d27
|
Merge pull request #10245 from peppy/editor-sample-addition-buttons
Add sample toggle buttons to toolbox
|
2020-09-25 20:09:10 +09:00 |
|
Dan Balasescu
|
93a137ed84
|
Merge pull request #10234 from peppy/editor-load-audio
Add audio track selection to editor setup screen
|
2020-09-25 19:58:23 +09:00 |
|
Dan Balasescu
|
cc41b4bb9e
|
Merge branch 'master' into editor-sample-addition-buttons
|
2020-09-25 19:39:12 +09:00 |
|
Dean Herbert
|
204024c76e
|
Merge branch 'master' into editor-load-audio
|
2020-09-25 18:32:51 +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 |
|
Dan Balasescu
|
e828cf1607
|
Merge branch 'master' into editor-load-audio
|
2020-09-25 14:49:54 +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 |
|
Dan Balasescu
|
952e84396a
|
Merge branch 'master' into editor-object-object-snapping
|
2020-09-25 13:17:30 +09:00 |
|
Dean Herbert
|
ea971ecb90
|
Remove local file handling from SetupScreen
|
2020-09-25 13:16:30 +09:00 |
|
Dean Herbert
|
f047ff10bf
|
Remove local specification for file selector search path
|
2020-09-25 12:30:05 +09:00 |
|
Dean Herbert
|
b1e72c311e
|
Add null check because we can
|
2020-09-25 12:28:41 +09:00 |
|
Dean Herbert
|
a17eac3692
|
Rename reload method to not mention beatmap unnecessarily
|
2020-09-25 12:27:08 +09:00 |
|
Dean Herbert
|
44a6637c36
|
Use SingleOrDefault
|
2020-09-25 12:20:37 +09:00 |
|
Dean Herbert
|
b9196718b7
|
Merge branch 'master' into editor-object-object-snapping
|
2020-09-25 12:15:10 +09:00 |
|
Dean Herbert
|
011b176244
|
Add test coverage of audio track changing
|
2020-09-24 22:00:13 +09:00 |
|
Dean Herbert
|
cc9ae32811
|
Fix summary timeline not updating to new track length correctly
|
2020-09-24 21:05:29 +09:00 |
|
Dean Herbert
|
833ff1c1d7
|
Fix test failures due to editor dependency
|
2020-09-24 20:56:35 +09:00 |
|
Dean Herbert
|
7e7e2fd64a
|
Use bindable for track to fix rate adjustments not applying correctly
|
2020-09-24 20:56:35 +09:00 |
|
Dean Herbert
|
978f6edf38
|
Add basic track reloading support while inside the editor
|
2020-09-24 20:56:35 +09:00 |
|
Dean Herbert
|
65e6dd2ac3
|
Remove the previous audio file before adding a new one
|
2020-09-24 20:56:35 +09:00 |
|
Dean Herbert
|
4d714866cd
|
Add ability to actually import a new audio file to the beatmap / database
|
2020-09-24 20:56:35 +09:00 |
|
Dean Herbert
|
4b9581bca0
|
Add audio selection to song setup screen
|
2020-09-24 20:56:35 +09:00 |
|
Dean Herbert
|
158d307126
|
Avoid destroying editor screens when changing between modes
|
2020-09-24 17:03:54 +09:00 |
|
Dean Herbert
|
44be0ab762
|
Add basic osu! object to object snapping
|
2020-09-24 16:24:35 +09:00 |
|
Dean Herbert
|
9c074e0ffb
|
Fix editor not showing sign when time goes negative
|
2020-09-24 13:10:54 +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
|
c38cd50723
|
Fix editor not using beatmap combo colours initially on load
|
2020-09-23 13:16:50 +09:00 |
|
Dean Herbert
|
3062fe4411
|
Add editor key bindings to switch between screens
|
2020-09-22 15:55:25 +09:00 |
|
Dean Herbert
|
1fcf443314
|
Ensure BeatmapProcessor.PostProcess is run before firing HitObjectUpdated events
|
2020-09-18 19:33:03 +09:00 |
|
Dean Herbert
|
daf54c7eb9
|
Revert EditorBeatmap.Remove API
|
2020-09-14 17:55:41 +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
|
692f2c8489
|
Simplify debounced update pathway
|
2020-09-14 14:58:00 +09:00 |
|
Dean Herbert
|
320e314356
|
Use minimum start time to handle SelectedHitObjects not being sorted
|
2020-09-13 22:53:30 +09:00 |
|
Dean Herbert
|
c573392bb2
|
Remove completed todo
|
2020-09-13 22:31:59 +09:00 |
|
Dean Herbert
|
1a9f0ac16a
|
Select new objects
|
2020-09-12 21:23:12 +09:00 |
|
Dean Herbert
|
3854caae9b
|
Remove secondary schedule logic
|
2020-09-12 21:23:12 +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
|
2d9b0acabe
|
Fix empty selection via keyboard shortcuts crashing
|
2020-09-12 21:23:10 +09:00 |
|
Dean Herbert
|
001cd1194c
|
Consume BindCollectionChanged
|
2020-09-11 22:53:03 +09:00 |
|
Dean Herbert
|
94d929d8cd
|
Remove unnecessary contains checks
|
2020-09-11 22:03:19 +09:00 |
|
Dean Herbert
|
08be45c9e7
|
Merge branch 'master' into editor-clipboard
|
2020-09-11 20:35:05 +09:00 |
|
Dean Herbert
|
97b995246a
|
Merge branch 'editor-fix-multiple-selection' into editor-clipboard
|
2020-09-11 20:34:58 +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
|
2858296c25
|
Avoid editor confirm-save dialog looping infinitely when using keyboard shortcut to exit
Will now exit without saving if the keyboard shortcut is activated twice
in a row, as expected.
Closes #10136.
|
2020-09-11 19:58:37 +09:00 |
|
Dean Herbert
|
de3d8e83e1
|
Add keyboard shortcuts
|
2020-09-11 19:55:41 +09:00 |
|
Dean Herbert
|
7d7401123c
|
Add initial implementation of editor clipboard
|
2020-09-11 19:54:20 +09:00 |
|
Dean Herbert
|
8e028dd88f
|
Fix incorrect ordering of ApplyDefaults for newly added objects
|
2020-09-11 19:54:11 +09:00 |
|
Dan Balasescu
|
75ebfe41e0
|
Merge pull request #10102 from peppy/editor-prompt-for-save
Prompt to save changes when exiting the editor
|
2020-09-09 23:56:41 +09:00 |
|
Dean Herbert
|
1803ecad80
|
Add cancel exit button
|
2020-09-09 20:04:25 +09:00 |
|
Dean Herbert
|
c6e72dabd3
|
Add test coverage
|
2020-09-09 20:04:25 +09:00 |
|
Dean Herbert
|
327179a81e
|
Expose unsaved changes state
|
2020-09-09 19:42:03 +09:00 |
|
Dean Herbert
|
6f067ff300
|
Only show confirmation if changes have been made since last save
|
2020-09-09 19:40:41 +09:00 |
|
Dean Herbert
|
ac0c4fcb8c
|
Add prompt to save beatmap on exiting editor
|
2020-09-09 19:31:19 +09:00 |
|
Dean Herbert
|
c9f5005efd
|
Add icons for editor toolbox tools
|
2020-09-09 18:40:01 +09:00 |
|
Dan Balasescu
|
53496aab33
|
Merge pull request #10090 from peppy/editor-song-setup
Add basic metadata info editing support to editor
|
2020-09-08 22:26:20 +09:00 |
|
Dan Balasescu
|
69f482f2cf
|
Merge pull request #10089 from peppy/fix-editor-multiple-screens
Avoid multiple editor screens potentially loading on top of each other
|
2020-09-08 21:26:10 +09:00 |
|
Dean Herbert
|
c38e7d796a
|
Fix tab key not working
|
2020-09-08 19:52:56 +09:00 |
|
Dean Herbert
|
b55b6e3746
|
Bring design somewhat in line with collections dialog
|
2020-09-08 19:52:56 +09:00 |
|
Dean Herbert
|
c8281b17bd
|
Remove editor screen fade (looks bad)
|
2020-09-08 19:52:56 +09:00 |
|
Dean Herbert
|
fe31edfa26
|
Add rudimentary saving logic
|
2020-09-08 19:52:56 +09:00 |
|
Dean Herbert
|
f43f8cf6b9
|
Add basic setup for song select screen
|
2020-09-08 19:52:56 +09:00 |
|
Dean Herbert
|
a501df954b
|
Avoid multiple editor screens potentially loading on top of each other
|
2020-09-08 19:52:05 +09:00 |
|
Dean Herbert
|
c3123bf117
|
Rename drag blueprint selection method for discoverability
|
2020-09-08 17:22:59 +09:00 |
|
Dean Herbert
|
9e559cb9ac
|
Merge branch 'master' into editor-new-beatmap
|
2020-09-08 02:58:38 +09:00 |
|
Dean Herbert
|
1468b9589f
|
Increase max sane BPM value
|
2020-09-07 18:20:47 +09:00 |
|
Dean Herbert
|
98676af7bb
|
Move default declarations for readability
|
2020-09-07 18:18:50 +09:00 |
|
Dean Herbert
|
86512d6e8d
|
Add BPM entry textbox
|
2020-09-07 18:18:50 +09:00 |
|
Dean Herbert
|
6091714f15
|
Limit BPM entry via slider to a sane range
|
2020-09-07 18:18:50 +09:00 |
|
smoogipoo
|
9ab6d584d3
|
Merge branch 'master' into editor-new-beatmap
|
2020-09-07 14:30:41 +09:00 |
|
Dan Balasescu
|
e17ccdfe9f
|
Merge branch 'master' into combo-colors
|
2020-09-07 13:55:41 +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
|
fba253f131
|
Take user argument in CreateNew method parameters
|
2020-09-04 13:17:43 +09:00 |
|
Dean Herbert
|
1f2f21e07a
|
Merge branch 'master' into editor-new-beatmap
|
2020-09-04 13:11:59 +09:00 |
|
Dean Herbert
|
fe524ec491
|
Merge branch 'master' into update-framework
|
2020-09-03 14:58:32 +09:00 |
|
Dean Herbert
|
d849f7f2b5
|
Use the local user's username when saving a new beatmap
|
2020-09-03 13:20:23 +09:00 |
|
Dean Herbert
|
e032844570
|
Start with a fresh beatmap when entering editor from main menu
|
2020-09-03 13:20:23 +09:00 |
|
Dean Herbert
|
c964e4036e
|
Merge branch 'master' into update-framework
|
2020-09-02 15:49:19 +09:00 |
|
Dean Herbert
|
249ae5df1b
|
Merge branch 'master' into beatmap-track-rework
|
2020-09-02 15:24:46 +09:00 |
|
Craftplacer
|
c2ade44656
|
Change types back
|
2020-09-01 17:58:06 +02:00 |
|
Craftplacer
|
9835d98942
|
Merge remote-tracking branch 'upstream/master' into combo-colors
|
2020-09-01 17:39:35 +02:00 |
|
Dan Balasescu
|
f08e7828da
|
Merge branch 'master' into beatmap-track-rework
|
2020-09-01 16:06:38 +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
|
d45a1521a1
|
Update BindableList usages
|
2020-09-01 11:56:23 +09:00 |
|
Dean Herbert
|
bee01bdd38
|
Fix first scroll wheel in editor incorrectly advancing twice
|
2020-08-31 18:01:16 +09:00 |
|
Craftplacer
|
db413686bb
|
Add BeatmapSkin to EditorBeatmap
|
2020-08-30 21:12:45 +02:00 |
|
Craftplacer
|
b39ec74bb8
|
Scope down to IBeatmapSkin in EditorChangeHandler
|
2020-08-30 16:07:06 +02:00 |
|
Craftplacer
|
f5c82d41eb
|
Remove if-cast
|
2020-08-30 16:06:48 +02:00 |
|
Craftplacer
|
00b68b050c
|
Merge remote-tracking branch 'upstream/master' into combo-colors
|
2020-08-30 10:16:38 +02:00 |
|
Dean Herbert
|
f65991f31f
|
Revert some usages based on review feedback
|
2020-08-26 23:28:58 +09:00 |
|
Craftplacer
|
e6646b9877
|
Resolve review comments
|
2020-08-23 15:08:02 +02: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 |
|
Dean Herbert
|
5ade1e8259
|
Merge branch 'master' into beatmap-track-rework
|
2020-08-18 13:03:49 +09:00 |
|
Dean Herbert
|
b969bc03e0
|
Add loading spinner while editor screen loads
|
2020-08-18 00:47:32 +09:00 |
|
Dean Herbert
|
d9debef156
|
Add explicit LoadTrack method
|
2020-08-17 15:38:16 +09:00 |
|
Craftplacer
|
cfd82104db
|
Minor changes and improvements
|
2020-08-16 01:00:28 +02:00 |
|
Craftplacer
|
48bdbb0cfb
|
Use existing field in Editor
|
2020-08-15 23:46:10 +02:00 |
|
Craftplacer
|
c4a7fac760
|
Add required parameters and other various changes
|
2020-08-15 22:03:24 +02:00 |
|
Craftplacer
|
69590113d6
|
Temporary changes
|
2020-08-12 06:40:21 +02:00 |
|
smoogipoo
|
070d71ec27
|
More cleanups
|
2020-08-12 00:48:38 +09:00 |
|
smoogipoo
|
e87f50f74f
|
Rename method
|
2020-08-07 22:31:41 +09:00 |
|
smoogipoo
|
b08ebe6f81
|
More inspections (rider is broken)
|
2020-08-07 21:14:45 +09:00 |
|
smoogipoo
|
961c6dab54
|
Fix more inspections
|
2020-08-07 21:08:03 +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
|
c8ebbc8594
|
Remove MusicController from EditorClock
|
2020-08-06 18:19:55 +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 |
|
Dan Balasescu
|
96c12bdf61
|
Merge pull request #9591 from peppy/editor-fix-double-click
Fix editor double-click incorrectly firing when clicks target different hitobjects
|
2020-07-17 17:58:15 +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 |
|
Dean Herbert
|
039790ce4f
|
Perform next timing point check before ensuring movement
|
2020-07-17 16:40:02 +09:00 |
|
Dean Herbert
|
e96e558728
|
Fix reversing scroll direction not always behaving as expected
|
2020-07-17 16:03:23 +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 |
|
smoogipoo
|
f3b5149648
|
Move some suggestions to warnings, resolve issues
|
2020-06-03 16:48:44 +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
|
12d65f305f
|
Simplify and fix incorrect seeking
|
2020-05-22 22:11:55 +09:00 |
|
Dean Herbert
|
1486a44b55
|
Merge branch 'editor-clock-cache' into editor-clock-transform
|
2020-05-22 19:51:02 +09:00 |
|
Dean Herbert
|
8b79e14225
|
Fix remaining test regressions
|
2020-05-22 19:49:49 +09:00 |
|
Dean Herbert
|
5ea33f4c04
|
Fix incorrect rounding in DragBar
|
2020-05-22 19:23:07 +09:00 |
|
Dean Herbert
|
866db629d6
|
Fix remaining test failures
|
2020-05-22 18:23:24 +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
|
dcfef6b443
|
Add clear method to EditorBeatmap
|
2020-05-08 18:46:37 +09:00 |
|
Dean Herbert
|
d470e092a3
|
Merge branch 'master' into fix-overlapping-object-undoredo
|
2020-05-01 10:45:29 +09:00 |
|
smoogipoo
|
c96bc5c51c
|
Fix undo/redo behaving poorly with simultaneous objects
|
2020-04-30 20:39:41 +09:00 |
|
smoogipoo
|
9bec42bc7e
|
Fix mania crashing on undo/redo
|
2020-04-30 20:03:46 +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
|
e1142b424d
|
Fix test failures
|
2020-04-22 18:14:21 +09:00 |
|
smoogipoo
|
9c22d2f1dd
|
Use platform bindings for editor actions
|
2020-04-22 17:41:24 +09:00 |
|
smoogipoo
|
9e2be6f2f4
|
Remove bindable to promote one-way access
|
2020-04-16 13:25:08 +09:00 |
|
smoogipoo
|
ce21cfbb03
|
Use bindables in menu items
|
2020-04-15 16:17:34 +09:00 |
|
smoogipoo
|
e8c955ed9b
|
Add CanUndo/CanRedo bindables
|
2020-04-15 16:17:17 +09:00 |
|
Dean Herbert
|
2388799acf
|
Limit upper number of editor beatmap states saved to 50
|
2020-04-13 20:37:46 +09:00 |
|
Dean Herbert
|
0e88c28060
|
Merge branch 'editor-undo-redo' into more-change-state-support
|
2020-04-13 18:07:00 +09:00 |
|
Dean Herbert
|
6aab19413c
|
Rename differ to patcher, add xmldoc
|
2020-04-13 17:20:20 +09:00 |
|
Dean Herbert
|
bb53f96c71
|
Store states as byte[] instead of Streams
|
2020-04-13 17:18:50 +09:00 |
|
Dean Herbert
|
0c60dbe796
|
Merge branch 'master' into editor-undo-redo
|
2020-04-13 16:03:53 +09:00 |
|
smoogipoo
|
4a87ac7840
|
Add support for sample changes
|
2020-04-10 13:53:09 +09:00 |
|
smoogipoo
|
ee7e2b0854
|
Fix editor beatmap potentially not updating hitobjects
|
2020-04-10 13:29:46 +09:00 |
|
smoogipoo
|
575b061dd7
|
Add change state support to more editor components
|
2020-04-09 22:02:42 +09:00 |
|
smoogipoo
|
2e33d38cd7
|
Merge branch 'master' into editor-undo-redo
|
2020-04-09 22:02:28 +09:00 |
|
Dean Herbert
|
cc0bcea6e5
|
Merge pull request #8693 from smoogipoo/editorbeatmap-update-cleanup
Cleanup handling of hitobject updates
|
2020-04-09 21:32:58 +09:00 |
|
smoogipoo
|
14eca3655b
|
Add change state handling to the editor
|
2020-04-09 21:22:07 +09:00 |
|
smoogipoo
|
86243d463f
|
Add legacy beatmap diffing
|
2020-04-09 20:48:59 +09:00 |
|
smoogipoo
|
683302a77d
|
Fix crash when trying to edit long beatmaps
|
2020-04-09 20:25:26 +09:00 |
|
smoogipoo
|
ee6ea08cf8
|
Cleanup handling of hitobject updates
|
2020-04-09 20:16:44 +09:00 |
|
smoogipoo
|
1f797207f7
|
Rework lookups to not require total playfield columns
|
2020-04-03 12:31:05 +09: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
|
5e3668b2ea
|
Merge pull request #8260 from smoogipoo/add-workingbeatmap-timeout
Add beatmap loading timeout to prevent runaway loading scenarios
|
2020-03-17 11:17:35 +09:00 |
|
Joehu
|
f7ea20a926
|
Limit font weight to bold
|
2020-03-16 16:32:25 -07:00 |
|
Dan Balasescu
|
f390c1995d
|
Apply comment suggestions
Co-Authored-By: Dean Herbert <pe@ppy.sh>
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
|
2020-03-16 11:29:28 +09:00 |
|
smoogipoo
|
c33ca6e99c
|
Decorate usages with exception management
|
2020-03-13 14:28:11 +09:00 |
|
Dean Herbert
|
ed837d3115
|
Use framework extension method for FromHex
|
2020-03-11 10:18:41 +09:00 |
|
smoogipoo
|
da89798765
|
Merge remote-tracking branch 'origin/master' into layout-rework
|
2020-02-26 15:06:40 +09:00 |
|
Dean Herbert
|
9557a2cd96
|
Use object initialiser
|
2020-02-25 20:52:33 +09:00 |
|
Dean Herbert
|
d6046abe70
|
Only expose save for now
|
2020-02-25 18:59:16 +09:00 |
|
smoogipoo
|
6c28fd21c7
|
osu-side changes
|
2020-02-24 20:52:15 +09:00 |
|
Dean Herbert
|
575946d923
|
Expose save and export options in editor to non-dekstop platforms
|
2020-02-23 20:47:14 +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
|
801e39a543
|
Improve xmldoc for PlacementObject
|
2020-02-08 11:35:27 +09:00 |
|
Dean Herbert
|
91203c2b12
|
Merge branch 'master' into placement-display-in-timeline
|
2020-02-08 01:50:24 +09:00 |
|
Dean Herbert
|
2082948f9a
|
Make editor screens display below timeline
|
2020-02-07 18:23:59 +09:00 |
|
Dean Herbert
|
56a091674b
|
Add placement display to timeline
|
2020-02-07 18:04:10 +09:00 |
|
Dean Herbert
|
e08437c5dc
|
Track placement object in EditorBeatmap
|
2020-02-07 18:03:14 +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
|
96986bf5fc
|
Remove beat divisor from ctor and use DI instead
|
2020-02-05 17:48:21 +09:00 |
|
Dean Herbert
|
63c595ed97
|
Make EditorBeatmap a component and move UpdateHitObject to it
|
2020-02-05 17:48:21 +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
|
018c005c71
|
Merge branch 'master' into distance-snap-grid-correct-colouring
|
2020-01-29 15:33:07 +09:00 |
|
Dan Balasescu
|
0d6fd0a54a
|
Merge branch 'master' into standardise-zoom-levels
|
2020-01-29 15:32:57 +09:00 |
|