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

32451 Commits

Author SHA1 Message Date
Dean Herbert
5ad2944e26 Fix ticks displaying higher than control point info 2020-10-01 19:31:41 +09:00
Dean Herbert
fcccce8b4e Use pink for sample control points to avoid clash with waveform blue 2020-10-01 19:03:17 +09:00
Dean Herbert
589a26a149 Ensure stable display order for control points in the same group 2020-10-01 18:59:35 +09:00
Dean Herbert
b75c202a7e Add sample control point display in timeline 2020-10-01 18:55:34 +09:00
Dean Herbert
0bced34272 Add visualisation of bpm (timing) changes to timeline 2020-10-01 18:55:34 +09:00
Dean Herbert
70931abcb0 Separate out timeline control point display from summary timeline display 2020-10-01 18:55:34 +09:00
Dean Herbert
70d475be1f Fix elements appearing in front of hitobjects 2020-10-01 18:54:59 +09:00
Dean Herbert
00a19b4879 Also add toggle for ticks display 2020-10-01 18:16:49 +09:00
Dean Herbert
b654396a4c Move ticks display to timeline 2020-10-01 18:16:30 +09:00
Dean Herbert
0d03084cdc Move control point display to the base timeline class
We want them to display on all screens with a timeline as they are quite
useful in all cases.
2020-10-01 18:16:12 +09:00
Dean Herbert
8c5176a97b
Merge pull request #10290 from smoogipoo/adjust-hit-result-types 2020-10-01 16:57:54 +09:00
smoogipoo
7890319802 Merge branch 'master' into adjust-hit-result-types 2020-10-01 16:19:07 +09:00
Dean Herbert
8654b0b0b0
Merge pull request #10288 from smoogipoo/scoring-standardisation 2020-10-01 15:56:21 +09:00
smoogipoo
cb6b35116a Merge branch 'master' into scoring-standardisation 2020-10-01 12:28:51 +09:00
smoogipoo
c9f38f7bb6 Add obsoletion notice 2020-10-01 12:28:33 +09:00
Dean Herbert
9d07dce5e4
Merge pull request #10251 from smoogipoo/additional-hit-results 2020-10-01 12:19:48 +09:00
smoogipoo
3c9ee6abc1 Use local static to determine score per spinner tick 2020-10-01 12:15:34 +09:00
smoogipoo
3a26bd8d9b Adjust obsoletion + xmldoc of NumericResultFor() 2020-10-01 12:14:16 +09:00
smoogipoo
806d8b4b1d Make scoring int-based again 2020-10-01 12:13:24 +09:00
smoogipoo
6b416c9881 Rename method and improve method implementation 2020-10-01 12:09:12 +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