68 Commits

• Move zoom settings back to run in a non-loaded state
  Dean Herbert · 2021-04-16 01:01:03 +09:00
  c2340f1fe8
• Set the timeline's height to a sane non-zero default

  This isn't required but makes the initial appearance animation nicer.

  Dean Herbert · 2021-04-16 00:58:32 +09:00
  15d48a924b
• Simplify content creation of Timeline / TimelineArea
  Dean Herbert · 2021-04-14 21:03:52 +09:00
  d1c68cb92b
• Adjust timeline sizing to closer match designs (but not 1:1 yet)
  Dean Herbert · 2021-04-14 20:54:35 +09:00
  99f05253fd
• Allow timeline to expand in height when control points are to be displayed
  Dean Herbert · 2021-04-14 20:10:50 +09:00
  1209c9fa32
• Allow timeline to govern the size of the rest of the editor content
  Dean Herbert · 2021-04-14 18:17:27 +09:00
  a314f90d37
• Display the centre marker above the waveform

  Gives it a bit more visibility. This is where it was meant to sit, but
  didn't consider using a proxy drawable to make it work previously.

  Dean Herbert · 2021-04-14 14:52:48 +09:00
  b7d2821b55
• Add marker showing where 00:00:000 is
  Dean Herbert · 2021-04-06 14:24:22 +09:00
  8ff13845d1
• Merge branch 'master' into editor-song-end
  Bartłomiej Dach · 2021-03-17 18:18:19 +01:00
  a691291ae8
• Merge branch 'master' into fix-editor-scroll-interruption
  Dan Balasescu · 2021-01-21 17:46:18 +09:00
  04095cd5b9
• Apply comment suggestion

  Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>

  Dan Balasescu · 2021-01-21 17:40:15 +09:00
  9eb74e86ed
• Expose and consume boolean covering whether an ongoing smooth seek is running
  Dean Herbert · 2021-01-15 16:14:38 +09:00
  831c06a3c7
• 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.

  Dean Herbert · 2021-01-15 15:47:42 +09:00
  ed78be825f
• Make all objects in selection candidates for spatial snapping

  Closes #10898.

  Dean Herbert · 2020-11-24 17:35:54 +09:00
  c9a41f9dae
• Add timeline visible range adjustment
  smoogipoo · 2020-11-13 17:10:29 +09:00
  0219aff7bc
• Merge branch 'master' into fix-editor-play-after-drag
  Dan Balasescu · 2020-11-04 14:45:20 +09:00
  42c543f5b9
• Add handling of opacity to timeline waveform display
  Dean Herbert · 2020-11-03 16:07:01 +09:00
  0dcb4ea441
• Fix editor clock not always remaining stopped when dragging timeline

  Closes https://github.com/ppy/osu/issues/10461.

  Dean Herbert · 2020-11-03 15:00:01 +09:00
  34aa59f237
• Reapply waveform colour fix
  Dean Herbert · 2020-10-19 16:57:08 +09:00
  79a17b2371
• Fix remaining conflicts
  Dean Herbert · 2020-10-05 20:09:18 +09:00
  6bc0afdafb
• Merge branch 'master' into control-point-timeline-representation
  Dean Herbert · 2020-10-05 19:24:28 +09:00
  ba55256fb4
• Fix ticks displaying higher than control point info
  Dean Herbert · 2020-10-01 19:31:41 +09:00
  5ad2944e26
• Separate out timeline control point display from summary timeline display
  Dean Herbert · 2020-10-01 18:55:34 +09:00
  70931abcb0
• Fix elements appearing in front of hitobjects
  Dean Herbert · 2020-10-01 18:54:59 +09:00
  70d475be1f
• Also add toggle for ticks display
  Dean Herbert · 2020-10-01 18:16:49 +09:00
  00a19b4879
• 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.

  Dean Herbert · 2020-10-01 18:16:12 +09:00
  0d03084cdc
• Merge branch 'master' into beatmap-track-rework
  Dean Herbert · 2020-09-02 15:24:46 +09:00
  249ae5df1b
• Fix potentially incorrect zoom level getting set on very short audio

  track

  Dean Herbert · 2020-09-01 15:41:36 +09:00
  d1f79a6a48
• Revert some usages based on review feedback
  Dean Herbert · 2020-08-26 23:28:58 +09:00
  f65991f31f
• Revert non-track usage
  Dean Herbert · 2020-08-22 19:47:08 +09:00
  122265ff0e
• Restore remaining editor components to use Beatmap.Track
  Dean Herbert · 2020-08-21 17:11:29 +09:00
  70697cf1a0
• Switch timeline to use track directly from beatmap again
  Dean Herbert · 2020-08-21 14:49:34 +09:00
  0b0ff62647
• More cleanups
  smoogipoo · 2020-08-12 00:48:38 +09:00
  070d71ec27
• Expose track from MusicController
  smoogipoo · 2020-08-06 16:24:14 +09:00
  5c05fe3988
• Move track to MusicController, compiles
  smoogipoo · 2020-08-06 16:24:14 +09:00
  6e42b8219c
• Merge branch 'master' into editor-clock-cache
  Dean Herbert · 2020-05-23 00:44:04 +09:00
  a3a9810344
• Fix incorrect rounding in DragBar
  Dean Herbert · 2020-05-22 19:23:07 +09:00
  5ea33f4c04
• Cache and resolve editor clock as EditorClock in all cases
  Dean Herbert · 2020-05-22 16:44:06 +09:00
  dd09d7830d
• Create SnapResult class to hold various snapping results
  Dean Herbert · 2020-05-20 21:00:47 +09:00
  c46bfc2532
• Change snapping to be screen space coordinate based
  Dean Herbert · 2020-05-20 21:00:29 +09:00
  3354d48a38
• Adjust editor timeline current marker to promote tick visibility
  Dean Herbert · 2020-04-27 10:54:32 +09:00
  48168dddce
• Fix editor crashing when entering with no beatmap selected
  Dean Herbert · 2020-04-24 10:27:32 +09:00
  1c13fa6c61
• Fix crash when trying to edit long beatmaps
  smoogipoo · 2020-04-09 20:25:26 +09:00
  683302a77d
• Fix seeking back to beginning too early
  voidedWarranties · 2020-03-23 22:37:53 -07:00
  b41f3f1cad
• Use [Resolved] wherever possible
  recapitalverb · 2020-02-14 20:14:00 +07:00
  c753cb46c5
• Initial implementation of timeline blueprint dragbars
  Dean Herbert · 2020-02-05 18:35:31 +09:00
  d04cc0123d
• Merge pull request #7644 from peppy/standardise-zoom-levels

  Standardise editor timeline zoom across maps of all lengths

  Dan Balasescu · 2020-01-29 16:04:25 +09:00
  63501c188a
• Merge branch 'master' into fix-beat-snap
  Dan Balasescu · 2020-01-29 15:32:27 +09:00
  65ac412ff8
• Standardise editor timeline zoom across maps of all lengths
  Dean Herbert · 2020-01-28 13:03:06 +09:00
  4bb33046ca
• Fix beat snap implementation being incorrect
  Dean Herbert · 2020-01-28 12:48:24 +09:00
  58654f28b6