018c005c71
Merge branch 'master' into distance-snap-grid-correct-colouring
2020-01-29 15:33:07 +09:00
0d6fd0a54a
Merge branch 'master' into standardise-zoom-levels
2020-01-29 15:32:57 +09:00
65ac412ff8
Merge branch 'master' into fix-beat-snap
2020-01-29 15:32:27 +09:00
391681b7af
Separate calculation to follow other examples
2020-01-29 15:16:48 +09:00
7d05840ee0
Merge branch 'master' into select-tool
2020-01-29 15:04:22 +09:00
9a47428bfd
Remove out of date comment
2020-01-29 14:40:42 +09:00
40379a5e22
Use foreach
2020-01-28 16:04:13 +09:00
8e2159e4eb
Ensure selection tool correctly matches selection state
...
- When a selection is made (via the timeline) the selection tool should become the select tool.
- When the selection tool is changed to anything *but* the select tool, the selection should be cleared.
2020-01-28 15:13:12 +09:00
e81d3c51ed
Move select tool to an actual tool implementation
...
Also tidies up radio button action firing so calling Select actually fires the associated action in all cases.
2020-01-28 15:05:29 +09:00
596a01661c
Remove 1ms offset and update tests
2020-01-28 13:42:22 +09:00
4bb33046ca
Standardise editor timeline zoom across maps of all lengths
2020-01-28 13:03:06 +09:00
58654f28b6
Fix beat snap implementation being incorrect
2020-01-28 12:48:24 +09:00
29daabb40a
Fix distance snap grid showing incorrect colouring
...
Now matches timeline colours (based on timing point).
2020-01-28 11:59:21 +09:00
d5fda053f4
Use centre origin/anchors
2020-01-27 18:09:54 +09:00
493390b750
Rename class to TimelineTickDisplay
2020-01-27 18:08:01 +09:00
084fa2f04a
Add timeline beat display
2020-01-27 17:38:50 +09:00
e24c4ab901
Adjust zoom defaults for timeline to be more useful
2020-01-27 17:34:40 +09:00
df665c3a3c
Move beat index colour retrieval to static function
2020-01-27 17:34:40 +09:00
508b92e611
Update beat divisor colours to be more distinguishable
...
Close to osu-stable
2020-01-27 17:34:40 +09:00
368587fc06
Merge branch 'master' into timeline-maybe
2020-01-24 18:08:29 +09:00
811ddb02a4
General refactoring
2020-01-24 17:50:36 +09:00
28727bbafd
Fix crash when deselecting via ctrl+click
2020-01-24 17:30:37 +09:00
e4702ffe9e
Fix editor rate adjustment polluting global beatmap rate
2020-01-24 13:10:02 +09:00
5646f7777e
Add comment about custom SelectionHandler
2020-01-23 16:23:42 +09:00
5cadbb1ffb
Move timeline blueprint to own class
2020-01-23 16:22:43 +09:00
9d90799447
Remove useless container
2020-01-23 16:20:42 +09:00
143d47ec93
Merge pull request #7538 from peppy/decouple-blueprint-container
...
Decouple blueprint container to allow usage in timeline
2020-01-23 16:13:51 +09:00
02ae92418f
Merge remote-tracking branch 'upstream/master' into decouple-blueprint-container
2020-01-23 15:54:46 +09:00
289be7a17b
Merge branch 'i-beat-snapping' into timeline-maybe
2020-01-23 15:45:33 +09:00
ccf911884b
Remove passed in BaetDivisor
2020-01-23 15:31:56 +09:00
098d643955
Move beat snapping to its own interface
2020-01-23 14:39:56 +09:00
56c044c44a
Move beat snapping to its own interface
2020-01-23 14:30:25 +09:00
cb09c2e144
Add support for dragging outside visible extents
2020-01-23 14:30:25 +09:00
477e1b7d27
Rename TimelineHitObjectDisplay to TimelineBlueprintContainer
2020-01-23 14:30:25 +09:00
9d2a46df89
Add beat snapping to timeline movement
2020-01-23 14:30:25 +09:00
c76f76e5aa
Fix being able to drag out of the blueprint intending to be moved
2020-01-23 14:30:25 +09:00
aa1a226ab7
Remove unused ScreenSpaceStartPosition field
2020-01-23 14:30:25 +09:00
53bdf72592
Allow basic timeline selection temporal movement
2020-01-23 14:30:25 +09:00
cb6e7425ae
Make dragbox stateful to fix blueprint movement
2020-01-23 14:30:25 +09:00
f0d810fe20
Follow start time and duration changes
2020-01-23 14:30:08 +09:00
63cef8b8b7
Rename nested classes to be more appropriate
2020-01-23 14:30:08 +09:00
89d90fdfa0
Fix drag not updating until mouse is moved while scrolling timeline
2020-01-23 14:30:07 +09:00
a8ec4907c4
Fix selections while scrolling timeline
2020-01-23 14:27:21 +09:00
c4395b1cea
Clean up nested class implementations
2020-01-23 14:27:20 +09:00
482409e776
Colour extension bars of long objects
2020-01-23 14:26:33 +09:00
a6775d1bd3
Implement custom drag box and allow drag seeking once again
2020-01-23 14:26:33 +09:00
8a7f7c5e46
Merge remote-tracking branch 'smoogipoo/void-key-up-returns' into update-framework
2020-01-22 22:57:56 +09:00
7c62cc3ac3
Merge remote-tracking branch 'smoogipoo/void-mouse-up-returns' into update-framework
2020-01-22 22:57:52 +09:00
7b2f58eb30
Apply OnRelease method signature refactorings
2020-01-22 13:22:34 +09:00
e3a2b20f63
Fix SelectionHandler visibility on remote selection
2020-01-22 01:32:11 +09:00
