1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 17:02:55 +08:00
Commit Graph

32414 Commits

Author SHA1 Message Date
Dean Herbert
9d07dce5e4
Merge pull request #10251 from smoogipoo/additional-hit-results 2020-10-01 12:19:48 +09:00
Bartłomiej Dach
97879c3c98
Merge pull request #10308 from GSculerlor/user-list-panel-bg
Fix UserListPanel background position
2020-10-01 01:10:08 +02:00
Ganendra Afrasya
ca9f5b447e Fix UserListPanel background position 2020-10-01 02:02:27 +07:00
Dan Balasescu
bc09b81815
Merge pull request #10268 from bdach/taiko-explosion-rework
Rework legacy taiko strong explosions to not require frame-perfect hits to show
2020-10-01 01:04:54 +09:00
Dan Balasescu
148e2769c8
Merge pull request #10304 from peppy/fix-control-point-bindable-updates
Fix control point timeline display not updating with changes
2020-09-30 23:30:35 +09:00
Dan Balasescu
5d76ce8350
Merge pull request #10285 from peppy/fix-storyboard-sample-pausing
Fix storyboard samples not pausing
2020-09-30 23:30:18 +09:00
Dan Balasescu
a6c7bc0cdb
Merge branch 'master' into taiko-explosion-rework 2020-09-30 23:02:46 +09:00
Dean Herbert
367b35bb10 Merge branch 'master' into fix-storyboard-sample-pausing 2020-09-30 22:42:26 +09:00
Dan Balasescu
6def54548b
Merge branch 'master' into fix-control-point-bindable-updates 2020-09-30 21:35:36 +09:00
Dan Balasescu
db78a0edf4
Merge pull request #10282 from peppy/fix-editor-silence-on-seek
Fix hit samples playing while paused / seeking in the editor
2020-09-30 21:33:25 +09:00
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
smoogipoo
77651be2ca Remove padding from HitResult 2020-09-30 21:32:50 +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
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
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
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
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
smoogipoo
07226c79b6 Add xmldocs 2020-09-29 16:33:23 +09:00
smoogipoo
cee58e89a3 Pad hit results 2020-09-29 16:32:02 +09:00
smoogipoo
1a70002cdd Split ignore into hit/miss 2020-09-29 14:41:50 +09:00
Dean Herbert
56c8e4dacf Fix failing tests 2020-09-29 14:25:39 +09:00
Dean Herbert
136843c8e4 Make DrawableStoryboardSample a SkinnableSound
Allows sharing pause logic with gameplay samples.
2020-09-29 14:25:39 +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