1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 20:22:55 +08:00
Commit Graph

32799 Commits

Author SHA1 Message Date
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
df9d4bc2f0 Merge branch 'master' into fix-control-point-bindable-updates 2020-09-30 20:27:25 +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
Dan Balasescu
496dd5bb2b
Merge pull request #10305 from peppy/update-framework
Update framework
2020-09-30 19:26:05 +09:00
Dean Herbert
fab11a8241 Update framework 2020-09-30 18:36:40 +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
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
e760ed8e01 Fix scroll wheel being handled by base test scene 2020-09-30 16:39:02 +09:00
Dean Herbert
1dd354120b Fix beatmap potentially changing in test scene 2020-09-30 16:16:14 +09:00
Dan Balasescu
8e868410db
Merge pull request #10201 from peppy/fix-spinner-rpm-user-rate-adjust
Fix SPM changing incorrectly with playback rate changes
2020-09-30 16:13:06 +09:00
Dean Herbert
2ef09a8730 Populate test scene with control points 2020-09-30 16:06:58 +09:00
Dean Herbert
a40c2ea5ee Simplify control point group binding/update logic 2020-09-30 16:02:22 +09:00
Dean Herbert
6cceb42ad5 Remove unused DI resolution 2020-09-30 15:50:53 +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
ae9e884a48 Fix header casing 2020-09-30 15:35:25 +09:00
Dean Herbert
7fad9ce34a Simplify HandleScale method 2020-09-30 15:20: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
313b0d149f Refactor scale and rotation operations to share code better
Also adds support for scaling individual sliders.
2020-09-30 14:41:33 +09:00
Dan Balasescu
2087e9799a
Merge pull request #10299 from peppy/timing-screen-display-format
Standardise time display formats across the editor
2020-09-30 14:02:55 +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
99a3801267 Tidy up scale/rotation operation code 2020-09-30 13:02:05 +09:00
Dean Herbert
1386c9fe66 Standardise time display formats across the editor 2020-09-30 12:45:43 +09:00
Dean Herbert
f93c72dd92 Fix non-matching filename 2020-09-29 20:21:13 +09:00
Dean Herbert
5ae6b2cf5b Fix syntax 2020-09-29 20:10:17 +09:00
Dean Herbert
a2e2cca396 Add proper change handler support 2020-09-29 20:08:56 +09:00
Dean Herbert
934db14e03 Add rotation support 2020-09-29 20:08:56 +09:00
Dean Herbert
33b24b6f46 Refactor to be able to get a quad for the current selection 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
265bba1a88 Add test coverage of event handling 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
smoogipoo
297168ecc4 Fix scores sometimes not being re-standardised correctly 2020-09-29 19:06:09 +09:00
smoogipoo
4c872094c9 Adjust slider tests 2020-09-29 18:29:50 +09:00
smoogipoo
cc9fa4675c Adjust HP increases 2020-09-29 17:59:42 +09:00
smoogipoo
379a4cca85 Adjust hold note tests 2020-09-29 17:48:44 +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