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 |
|
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 |
|