1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 22:27:25 +08:00
Commit Graph

6622 Commits

Author SHA1 Message Date
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
a11c74d600 Update to consume framework fixes 2020-09-30 20:27:02 +09:00
Dean Herbert
f9d6aed2df Merge branch 'master' into timing-screen-clean-up 2020-09-30 20:26:02 +09:00
Dean Herbert
44fc0c6723 Fix default value of bpm being too high 2020-09-30 18:08:55 +09:00
Dean Herbert
b0f8e11bd4 Fix incorrect caching 2020-09-30 17:34:14 +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
7f579850dd
Merge branch 'master' into fix-editor-silence-on-seek 2020-09-30 17:03:23 +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
414c40d298 Reverse inheritance order of SkinnableSound's pause logic 2020-09-30 15:45:14 +09:00
Dan Balasescu
466d37a450
Merge branch 'master' into fix-spinner-rpm-user-rate-adjust 2020-09-30 15:43:56 +09:00
Dean Herbert
59ce9fcab9 Merge branch 'master' into fix-editor-silence-on-seek 2020-09-30 15:35:55 +09:00
Dean Herbert
1386c9fe66 Standardise time display formats across the editor 2020-09-30 12:45:43 +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
74e74e1c31 Fix pause loop sound not working because paused 2020-09-29 14:20:41 +09:00
Dean Herbert
c5f6b77bba Add missing cached type 2020-09-29 13:42:17 +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
Dean Herbert
fd58a24183
Merge branch 'master' into fix-spinner-rpm-user-rate-adjust 2020-09-28 17:45:48 +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
Dean Herbert
b2261f03e2
Merge branch 'master' into fix-spinner-rpm-user-rate-adjust 2020-09-25 20:21:35 +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