Commit Graph

1265 Commits

Author SHA1 Message Date
1bb9f018a0 Merge branch 'master' into fix-timeline-depth-ordering 2021-03-29 20:47:47 +09:00
3cf6a3f56d Merge pull request #12076 from peppy/add-timeline-stacking-support
Implement editor timeline stacking support
2021-03-29 20:44:52 +09:00
690debe507 Merge pull request #12030 from LeNitrous/editor-platform-clipboard-copy 2021-03-29 19:31:16 +09:00
3909eda095 Avoid using a StringBuilder 2021-03-29 18:51:28 +09:00
90ab765cf5 Reorder methods and surround with region 2021-03-29 18:46:32 +09:00
cdb779f764 move copy logic inside ComposeScreen 2021-03-29 17:30:23 +08:00
21398e25b5 null check composer and ensure the correct start time from selected hit objects 2021-03-27 10:02:21 +08:00
c96321206a fix appveyor complaints 2021-03-26 16:17:24 +08:00
71a0616861 remove extra semi colons 2021-03-26 15:34:45 +08:00
374f8c5e22 move to compose namespace and add license header 2021-03-26 15:33:28 +08:00
cb48e5f158 Fix timeline not visually ordering hitobjects in a stable way 2021-03-26 16:33:18 +09:00
b8b7eb4c4b refactor logic to its own component and handle hit object to string conversion to its ruleset-specific composers 2021-03-26 15:25:20 +08:00
2bea69456e remove implementations 2021-03-26 15:24:33 +08:00
77969bb223 Merge branch 'master' into add-timeline-stacking-support 2021-03-26 16:17:10 +09:00
8d4ff867bf Fix barlines showing up in the osu!mania editor's timeline 2021-03-25 16:30:31 +09:00
9fdd23b134 Fix various issues with stacking 2021-03-25 16:28:30 +09:00
bdc783b55f Merge branch 'master' into add-timeline-stacking-support 2021-03-25 15:28:30 +09:00
7b3336783f Stabilise ordering instead of simple reversing
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2021-03-25 15:24:59 +09:00
dd48b68f8a Ensure selected blueprints are given selection priority 2021-03-19 22:44:33 +01:00
71a361337d Add comment regarding usage of Reverse()
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2021-03-19 21:57:48 +09:00
e72205eea2 Merge pull request #12080 from peppy/add-25-playback-editor
Change editor speed adjust to adjust frequency (and restore 25% option)
2021-03-19 21:04:12 +09:00
8955071703 Change editor speed adjust to adjust frequency 2021-03-19 20:01:45 +09:00
9be7981e0d Adjust timeline ticks to be more visible 2021-03-19 19:45:00 +09:00
563a0584d5 Implement editor timeline stacking support 2021-03-19 18:48:51 +09:00
32c571fc94 Adjust keyboard step to be something sensible 2021-03-19 17:13:30 +09:00
711d895a04 Merge pull request #8238 from voidedWarranties/editor-song-end 2021-03-19 16:32:23 +09:00
b9761c8196 Further simplify logic 2021-03-18 16:20:31 -07:00
df6570ebf5 Improve logic and add previously failing test
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2021-03-17 15:48:55 -07:00
2e63c2ce20 Fix selection box operation hotkeys not registering in change handler
Could lead to crashes after reversing a note cluster and playing it
back.

The root cause of the crash was that the hotkey operations were not ran
inside of an editor change handler operation. This, in turn, caused the
autoplay replay to not be regenerated after flipping an object cluster,
therefore finally manifesting as a hard crash due to negative time
offsets appearing in judgement results, which interfered with the
default implementation of note lock.

Note that this incidentally also fixes the fact that selection box
hotkey operations (reverse and flip) did not handle undo/redo.
2021-03-17 22:17:42 +01:00
a691291ae8 Merge branch 'master' into editor-song-end 2021-03-17 18:18:19 +01:00
5a7e416495 Merge pull request #12027 from peppy/new-beatmap-empty-fields
Don't fill beatmap metadata with template values on creating a new beatmap
2021-03-17 19:36:21 +09:00
51e0304c54 properly format strings per ruleset 2021-03-17 18:31:09 +08:00
133ff085a5 refactor code 2021-03-17 18:06:40 +08:00
8046b5a818 set text to platform clipboard on copy 2021-03-17 17:35:49 +08:00
d0e61e5b4d Put back the label 2021-03-17 17:14:04 +09:00
3b6a1180b6 Remove non-accessed field 2021-03-17 17:02:11 +09:00
5adc675862 Focus artist textbox on entering song setup if fields are empty 2021-03-17 16:57:14 +09:00
eda891223c Start the editor with empty artist/creator/difficulty name fields 2021-03-17 16:47:12 +09:00
c7740d1181 Fix opening the editor occasionally causing a hard crash due to incorrect threading logic
Setting one of the global screen `Bindable`s (in this case, `Beatmap`)
is not valid from anywhere but the update thread. This changes the order
in which things happen during the editor startup process to ensure
correctness.

Closes #11968.
2021-03-17 15:52:25 +09:00
cd1c1bf534 Centralise cases of performing actions on the current selection
By moving this to a central location, we can avoid invoking the
EditorChangeHandler when there is no selection made. This helps
alleviate the issue pointed out in
https://github.com/ppy/osu/issues/11901, but not fix it completely.
2021-02-26 14:15:13 +09:00
e9730d4782 Move default sample addition to inside PlacementBlueprint
This isn't actually required to fix the behaviour but it does feel like
a better place to put this logic.
2021-02-11 17:16:18 +09:00
3ce605b5e5 Small refactoring to use .Trim() instead 2021-02-09 12:00:03 +09:00
414e05affd Fix editor effect attribute tooltip having unnecessary whitespace when only one is enabled 2021-02-08 10:16:16 -08:00
0dd1b1026c Merge pull request #11495 from smoogipoo/more-accurate-most-common-bpm
Make most common BPM more accurate
2021-02-08 20:08:58 +09:00
69ca440ae5 Merge branch 'master' into more-accurate-most-common-bpm 2021-02-08 18:40:58 +09:00
5e7823b289 Fix attributes content being zero size and disappearing after being half off-screen 2021-02-08 01:37:34 -08:00
6b26a18a23 Fix attributes header not being aligned with content in editor timing mode 2021-02-08 01:34:32 -08:00
96652e07cd Merge branch 'master' into zero-spinner-slider 2021-02-05 09:40:55 -05:00
5061231e59 Switch to beat length 2021-02-05 09:39:14 -05:00
c70dd2edfc Merge pull request #11569 from peppy/fix-editor-new-beatmap-crash
Fix a potential crash when exiting the editor before a new beatmap is added to the database
2021-02-01 21:01:51 +09:00