Commit Graph

8120 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
4a5fc82388 Merge branch 'master' into add-timeline-stacking-support 2021-03-29 18:42:59 +09:00
cdb779f764 move copy logic inside ComposeScreen 2021-03-29 17:30:23 +08:00
16e184e531 Merge pull request #12183 from frenzibyte/legacy-sprite-text-fonts
Improve code quality of constructing legacy sprite texts
2021-03-27 20:39:33 +09: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
6a4157d193 Remove unused using statement 2021-03-26 16:13:43 +09:00
7faca766e4 Fix crash on attempting to join lobby using key press during a pending join
Closes https://github.com/ppy/osu/issues/12040.
2021-03-26 14:49:05 +09:00
6aa0c9d8fd Merge branch 'master' into legacy-sprite-text-fonts 2021-03-25 14:52:01 +03: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
4269cb7124 Extract majority of token retrieval code out of LoadComponentAsync for legibility 2021-03-25 13:48:41 +09:00
d55324585d Change RoomSubmittingPlayer's request implementation to return null on RoomID missing, rather than silently succeeding 2021-03-24 13:23:23 +09:00
84b2f9a848 Make token private 2021-03-24 13:20:44 +09:00
a0c6c4da35 Rename and refactor token request process to be easier to understand 2021-03-24 13:17:29 +09:00
e372e355ef Reorder overrides in SoloPlayer to better follow chronological request order 2021-03-24 13:12:51 +09:00
8bed7748d6 Rename token request method to avoid double Request terminology 2021-03-24 13:02:37 +09:00
a1c35677ef Add more xmldoc 2021-03-24 13:02:17 +09:00
e649a330a4 Implement SoloPlayer's request construction 2021-03-23 18:23:25 +09:00
242b847516 Add flow for allowing gameplay to continue even when an error occurs with token retrieval 2021-03-23 18:23:25 +09:00
3cd8bf2d7f Move token request construction to LoadAsyncComplete to better allow DI usage 2021-03-23 18:20:55 +09:00
571124669d Remove all references to "score submission" from Player 2021-03-23 18:20:55 +09:00
194b2d05d3 Update SoloPlayer to derive SubmittingPlayer 2021-03-23 18:20:55 +09:00
12f050264a Further split out a player class which submits to "rooms" 2021-03-23 18:20:55 +09:00
7045fce555 Move score submission logic in general out to its own Player type 2021-03-23 18:20:55 +09:00
6cb14e91c9 Make Player abstract and introduce SoloPlayer 2021-03-23 18:18:49 +09:00
9c690f9545 Fix second usage 2021-03-23 14:08:00 +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