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

158 Commits

Author SHA1 Message Date
smoogipoo
58c8184ad7 Define blueprint order similarly to hitobjects 2020-11-17 22:56:31 +09:00
Bartłomiej Dach
610ed99ae3 Add null checks to unguarded resolved-as-null fields 2020-11-14 14:52:58 +01:00
smoogipoo
0219aff7bc Add timeline visible range adjustment 2020-11-13 17:10:29 +09:00
smoogipoo
4ef2e9548c Pass HitObjectComposer to BlueprintContainer via ctor 2020-11-13 16:59:37 +09:00
Bartłomiej Dach
ddbd6df24d Unbind bindable lists for general safety 2020-11-07 20:59:57 +01:00
Dan Balasescu
3322c2bbc5
Merge branch 'master' into ios-editor-crash-fix 2020-11-04 15:56:40 +09:00
Dean Herbert
487a5ecdba Replace all usage of IBindableList.GetBoundCopy 2020-11-04 15:29:14 +09:00
Dan Balasescu
42c543f5b9
Merge branch 'master' into fix-editor-play-after-drag 2020-11-04 14:45:20 +09:00
Bartłomiej Dach
3bb86ce127
Merge branch 'master' into editor-waveform-opacity 2020-11-03 23:04:19 +01:00
Bartłomiej Dach
ddf0d75c38 Don't fall through to seek if handling zoom 2020-11-03 21:49:21 +01:00
Bartłomiej Dach
4b528e80d0 Use AltPressed shorthand 2020-11-03 21:49:04 +01:00
Dean Herbert
c2ffc18379 Change editor timeline mouse wheel handling to scroll by default (and zoom with alt held) 2020-11-03 16:30:11 +09:00
Dean Herbert
0dcb4ea441 Add handling of opacity to timeline waveform display 2020-11-03 16:07:01 +09:00
Dean Herbert
34aa59f237 Fix editor clock not always remaining stopped when dragging timeline
Closes https://github.com/ppy/osu/issues/10461.
2020-11-03 15:00:01 +09:00
Bartłomiej Dach
432282e8de Use alternative solution to avoid storing last zoom 2020-11-01 21:25:05 +01:00
Leon Gebler
983a2774e8 Code Formatting 2020-10-27 15:09:10 +01:00
Leon Gebler
064c50c3ac Expose currentZoom to fix selection box wiggle 2020-10-27 14:38:35 +01:00
Leon Gebler
704f8cc4f2 Fix selection box wandering off into the distance 2020-10-26 18:45:03 +01:00
Dean Herbert
79a17b2371 Reapply waveform colour fix 2020-10-19 16:57:08 +09:00
Dan Balasescu
ecfb7e94c5
Merge branch 'master' into fix-editor-batch-handling 2020-10-09 20:06:06 +09:00
Dean Herbert
21c6242f90 Fix bar lines ("down beat" as people call it) showing up too often in timeline 2020-10-09 18:35:44 +09:00
Dean Herbert
5d888f687a Account for the width of points so they don't suddenly appear at timeline edges 2020-10-09 16:49:51 +09:00
Dean Herbert
ceb1494c33 Only run regeneration when passing a new min/max tick boundary 2020-10-09 16:47:29 +09:00
Dean Herbert
017a8ce496 Only recalculate when display actually changes 2020-10-09 15:57:31 +09:00
Dean Herbert
9baf704942 Add local pooling to TimelineTickDisplay 2020-10-09 15:48:24 +09:00
Dean Herbert
afed832b19 Tidy up EditorBeatmap slightly 2020-10-08 18:06:49 +09:00
Dean Herbert
ef092de9ba Add missing UpdateHitObject calls and move local to usages (not via bindables) 2020-10-08 18:04:07 +09:00
Dean Herbert
a2796d2c01 Add repeats display to timeline blueprints 2020-10-06 19:22:35 +09:00
Dan Balasescu
783a463772
Merge branch 'master' into colourise-control-point-table 2020-10-05 20:47:06 +09:00
Dean Herbert
6bc0afdafb Fix remaining conflicts 2020-10-05 20:09:18 +09:00
Dean Herbert
ba55256fb4
Merge branch 'master' into control-point-timeline-representation 2020-10-05 19:24:28 +09:00
Dean Herbert
0d3a95d8fc Remove unnecessary string interpolation 2020-10-02 19:54:13 +09:00
Dean Herbert
5ad2944e26 Fix ticks displaying higher than control point info 2020-10-01 19:31:41 +09:00
Dean Herbert
e96e30a19d Move control point colour specifications to common location and use for formatting timing screen table 2020-10-01 19:29:34 +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
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
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
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
5b200a8ca4 Change default zoom of timing screen timeline to most zoomed out 2020-09-30 16:39:27 +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
249ae5df1b
Merge branch 'master' into beatmap-track-rework 2020-09-02 15:24:46 +09:00