Commit Graph

173 Commits

Author SHA1 Message Date
b489e92c9e Fix TimelineParts not using correct beatmap 2021-01-25 18:44:36 +09:00
04095cd5b9 Merge branch 'master' into fix-editor-scroll-interruption 2021-01-21 17:46:18 +09:00
9eb74e86ed Apply comment suggestion
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2021-01-21 17:40:15 +09:00
831c06a3c7 Expose and consume boolean covering whether an ongoing smooth seek is running 2021-01-15 16:14:38 +09:00
ed78be825f Fix editor timeline not snapping on non-precise wheel scroll
For wheel input with precision, we still prefer exact tracking for now.
May change this in the future based on feedback from mappers, but it
makes little sense to do non-snapped scrolling when input is coming from
a non-precise source.
2021-01-15 15:47:42 +09:00
423c6158e1 Highlight timeline drag area when hovered for better visibility 2020-12-21 18:10:11 +09:00
d1be7c23d9 Increase height of timeline drag area 2020-12-21 18:09:56 +09:00
d11d754715 Increase size of circle display on timeline 2020-12-21 18:09:37 +09:00
94a8784e04 Allow editor change handler to be null 2020-12-01 20:08:31 +01:00
190c6ef45e Fix timeline not updating ticks correctly after arbitrary timing control point changes 2020-12-01 16:44:08 +09:00
741902f1b3 Merge pull request #10971 from smoogipoo/fix-timeline-combo-colour
Fix timeline blueprints sometimes not receiving combo colours
2020-11-26 19:47:21 +09:00
e53f849aa0 Completely separate combo colours from DHOs 2020-11-26 18:14:25 +09:00
f562854feb Fix timeline objects sometimes not receiving combo colours 2020-11-26 17:22:22 +09:00
c9a41f9dae Make all objects in selection candidates for spatial snapping
Closes #10898.
2020-11-24 17:35:54 +09:00
783c172b5d Make sealed and cleanup comparator 2020-11-18 13:33:22 +09:00
58c8184ad7 Define blueprint order similarly to hitobjects 2020-11-17 22:56:31 +09:00
610ed99ae3 Add null checks to unguarded resolved-as-null fields 2020-11-14 14:52:58 +01:00
0219aff7bc Add timeline visible range adjustment 2020-11-13 17:10:29 +09:00
4ef2e9548c Pass HitObjectComposer to BlueprintContainer via ctor 2020-11-13 16:59:37 +09:00
ddbd6df24d Unbind bindable lists for general safety 2020-11-07 20:59:57 +01:00
3322c2bbc5 Merge branch 'master' into ios-editor-crash-fix 2020-11-04 15:56:40 +09:00
487a5ecdba Replace all usage of IBindableList.GetBoundCopy 2020-11-04 15:29:14 +09:00
42c543f5b9 Merge branch 'master' into fix-editor-play-after-drag 2020-11-04 14:45:20 +09:00
3bb86ce127 Merge branch 'master' into editor-waveform-opacity 2020-11-03 23:04:19 +01:00
ddf0d75c38 Don't fall through to seek if handling zoom 2020-11-03 21:49:21 +01:00
4b528e80d0 Use AltPressed shorthand 2020-11-03 21:49:04 +01:00
c2ffc18379 Change editor timeline mouse wheel handling to scroll by default (and zoom with alt held) 2020-11-03 16:30:11 +09:00
0dcb4ea441 Add handling of opacity to timeline waveform display 2020-11-03 16:07:01 +09:00
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
432282e8de Use alternative solution to avoid storing last zoom 2020-11-01 21:25:05 +01:00
983a2774e8 Code Formatting 2020-10-27 15:09:10 +01:00
064c50c3ac Expose currentZoom to fix selection box wiggle 2020-10-27 14:38:35 +01:00
704f8cc4f2 Fix selection box wandering off into the distance 2020-10-26 18:45:03 +01:00
79a17b2371 Reapply waveform colour fix 2020-10-19 16:57:08 +09:00
ecfb7e94c5 Merge branch 'master' into fix-editor-batch-handling 2020-10-09 20:06:06 +09:00
21c6242f90 Fix bar lines ("down beat" as people call it) showing up too often in timeline 2020-10-09 18:35:44 +09:00
5d888f687a Account for the width of points so they don't suddenly appear at timeline edges 2020-10-09 16:49:51 +09:00
ceb1494c33 Only run regeneration when passing a new min/max tick boundary 2020-10-09 16:47:29 +09:00
017a8ce496 Only recalculate when display actually changes 2020-10-09 15:57:31 +09:00
9baf704942 Add local pooling to TimelineTickDisplay 2020-10-09 15:48:24 +09:00
afed832b19 Tidy up EditorBeatmap slightly 2020-10-08 18:06:49 +09:00
ef092de9ba Add missing UpdateHitObject calls and move local to usages (not via bindables) 2020-10-08 18:04:07 +09:00
a2796d2c01 Add repeats display to timeline blueprints 2020-10-06 19:22:35 +09:00
783a463772 Merge branch 'master' into colourise-control-point-table 2020-10-05 20:47:06 +09:00
6bc0afdafb Fix remaining conflicts 2020-10-05 20:09:18 +09:00
ba55256fb4 Merge branch 'master' into control-point-timeline-representation 2020-10-05 19:24:28 +09:00
0d3a95d8fc Remove unnecessary string interpolation 2020-10-02 19:54:13 +09:00
5ad2944e26 Fix ticks displaying higher than control point info 2020-10-01 19:31:41 +09:00
e96e30a19d Move control point colour specifications to common location and use for formatting timing screen table 2020-10-01 19:29:34 +09:00
fcccce8b4e Use pink for sample control points to avoid clash with waveform blue 2020-10-01 19:03:17 +09:00