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 |
|
Dean Herbert
|
d1f79a6a48
|
Fix potentially incorrect zoom level getting set on very short audio
track
|
2020-09-01 15:41:36 +09:00 |
|
Dean Herbert
|
f65991f31f
|
Revert some usages based on review feedback
|
2020-08-26 23:28:58 +09:00 |
|
Dean Herbert
|
122265ff0e
|
Revert non-track usage
|
2020-08-22 19:47:08 +09:00 |
|
Dean Herbert
|
70697cf1a0
|
Restore remaining editor components to use Beatmap.Track
|
2020-08-21 17:11:29 +09:00 |
|
Dean Herbert
|
0b0ff62647
|
Switch timeline to use track directly from beatmap again
|
2020-08-21 14:49:34 +09:00 |
|
smoogipoo
|
070d71ec27
|
More cleanups
|
2020-08-12 00:48:38 +09:00 |
|
smoogipoo
|
5002d69f69
|
Update inspections
|
2020-08-07 20:51:56 +09:00 |
|
smoogipoo
|
61b632516e
|
Ensure CurrentTrack is never null
|
2020-08-07 19:43:16 +09:00 |
|
smoogipoo
|
5c05fe3988
|
Expose track from MusicController
|
2020-08-06 16:24:14 +09:00 |
|
smoogipoo
|
6e42b8219c
|
Move track to MusicController, compiles
|
2020-08-06 16:24:14 +09:00 |
|
Dean Herbert
|
cbd563e80b
|
Rename to IHasDuration
|
2020-05-27 12:38:39 +09:00 |
|
Dean Herbert
|
b8e0a6f127
|
Move sett from EndTime to Duration
|
2020-05-27 12:37:44 +09:00 |
|
Dean Herbert
|
a3a9810344
|
Merge branch 'master' into editor-clock-cache
|
2020-05-23 00:44:04 +09:00 |
|
Dean Herbert
|
5ea33f4c04
|
Fix incorrect rounding in DragBar
|
2020-05-22 19:23:07 +09:00 |
|
Dean Herbert
|
dd09d7830d
|
Cache and resolve editor clock as EditorClock in all cases
|
2020-05-22 16:44:06 +09:00 |
|
Dean Herbert
|
c46bfc2532
|
Create SnapResult class to hold various snapping results
|
2020-05-20 21:00:47 +09:00 |
|
Dean Herbert
|
3354d48a38
|
Change snapping to be screen space coordinate based
|
2020-05-20 21:00:29 +09:00 |
|
smoogipoo
|
104c61d622
|
Remove unnecessary scale
|
2020-04-27 11:06:23 +09:00 |
|
Dean Herbert
|
48168dddce
|
Adjust editor timeline current marker to promote tick visibility
|
2020-04-27 10:54:32 +09:00 |
|
Dean Herbert
|
1c13fa6c61
|
Fix editor crashing when entering with no beatmap selected
|
2020-04-24 10:27:32 +09:00 |
|
smoogipoo
|
575b061dd7
|
Add change state support to more editor components
|
2020-04-09 22:02:42 +09:00 |
|
smoogipoo
|
683302a77d
|
Fix crash when trying to edit long beatmaps
|
2020-04-09 20:25:26 +09:00 |
|
voidedWarranties
|
b41f3f1cad
|
Fix seeking back to beginning too early
|
2020-03-23 22:37:53 -07:00 |
|
Dean Herbert
|
ed837d3115
|
Use framework extension method for FromHex
|
2020-03-11 10:18:41 +09:00 |
|
recapitalverb
|
c753cb46c5
|
Use [Resolved] wherever possible
|
2020-02-14 20:14:00 +07:00 |
|
Dean Herbert
|
0e439e3a70
|
Fix missing dependency in ZoomableScrollContainer test
|
2020-02-14 14:41:55 +09:00 |
|
Dan Balasescu
|
60d796ae3f
|
Merge branch 'master' into fix-timeline-seek-while-playing
|
2020-02-14 13:04:38 +09:00 |
|
Dean Herbert
|
118f862342
|
Fix not being able to seek using scroll wheel in timeline while playing track
|
2020-02-13 12:03:50 +09:00 |
|
Dean Herbert
|
487dd47c9e
|
Add mouse down repeat support to timeline zoom buttons
|
2020-02-13 11:14:09 +09:00 |
|
Dean Herbert
|
56a091674b
|
Add placement display to timeline
|
2020-02-07 18:04:10 +09:00 |
|
smoogipoo
|
6ae0efa40d
|
Fix adjustment not working when dragged before object
|
2020-02-06 14:47:43 +09:00 |
|
smoogipoo
|
c138e3907e
|
Move methods below ctor
|
2020-02-06 14:35:45 +09:00 |
|
Dean Herbert
|
f5edad16e6
|
Improve visuals
|
2020-02-05 19:43:13 +09:00 |
|
Dean Herbert
|
98ab1f9862
|
Fix negative spinners
|
2020-02-05 18:35:31 +09:00 |
|
Dean Herbert
|
3d42973764
|
Allow scrolling via drag while dragging a hold note handle
|
2020-02-05 18:35:31 +09:00 |
|
Dean Herbert
|
cef45afbc8
|
Add a simple hover state
|
2020-02-05 18:35:31 +09:00 |
|
Dean Herbert
|
d56accaef1
|
Disallow negative / zero repeat counts (and fix off-by-one)
|
2020-02-05 18:35:31 +09:00 |
|
Dean Herbert
|
d04cc0123d
|
Initial implementation of timeline blueprint dragbars
|
2020-02-05 18:35:31 +09:00 |
|
Dean Herbert
|
90caa61245
|
Reverse comparison for readability
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
|
2020-02-01 02:05:26 +09:00 |
|
Dean Herbert
|
f51cfa2220
|
Fix too many ticks being displayed on beatmaps with multiple timing sections
Closes https://github.com/ppy/osu/issues/7681.
|
2020-01-31 00:24:00 +09:00 |
|
Dan Balasescu
|
63501c188a
|
Merge pull request #7644 from peppy/standardise-zoom-levels
Standardise editor timeline zoom across maps of all lengths
|
2020-01-29 16:04:25 +09:00 |
|
Dan Balasescu
|
0d6fd0a54a
|
Merge branch 'master' into standardise-zoom-levels
|
2020-01-29 15:32:57 +09:00 |
|
Dan Balasescu
|
65ac412ff8
|
Merge branch 'master' into fix-beat-snap
|
2020-01-29 15:32:27 +09:00 |
|
Dean Herbert
|
4bb33046ca
|
Standardise editor timeline zoom across maps of all lengths
|
2020-01-28 13:03:06 +09:00 |
|
Dean Herbert
|
58654f28b6
|
Fix beat snap implementation being incorrect
|
2020-01-28 12:48:24 +09:00 |
|
Dean Herbert
|
d5fda053f4
|
Use centre origin/anchors
|
2020-01-27 18:09:54 +09:00 |
|
Dean Herbert
|
493390b750
|
Rename class to TimelineTickDisplay
|
2020-01-27 18:08:01 +09:00 |
|
Dean Herbert
|
084fa2f04a
|
Add timeline beat display
|
2020-01-27 17:38:50 +09:00 |
|
Dean Herbert
|
e24c4ab901
|
Adjust zoom defaults for timeline to be more useful
|
2020-01-27 17:34:40 +09:00 |
|
smoogipoo
|
811ddb02a4
|
General refactoring
|
2020-01-24 17:50:36 +09:00 |
|
Dean Herbert
|
5646f7777e
|
Add comment about custom SelectionHandler
|
2020-01-23 16:23:42 +09:00 |
|
Dean Herbert
|
5cadbb1ffb
|
Move timeline blueprint to own class
|
2020-01-23 16:22:43 +09:00 |
|
Dean Herbert
|
9d90799447
|
Remove useless container
|
2020-01-23 16:20:42 +09:00 |
|
Dean Herbert
|
289be7a17b
|
Merge branch 'i-beat-snapping' into timeline-maybe
|
2020-01-23 15:45:33 +09:00 |
|
Dean Herbert
|
56c044c44a
|
Move beat snapping to its own interface
|
2020-01-23 14:30:25 +09:00 |
|
Dean Herbert
|
cb09c2e144
|
Add support for dragging outside visible extents
|
2020-01-23 14:30:25 +09:00 |
|
Dean Herbert
|
477e1b7d27
|
Rename TimelineHitObjectDisplay to TimelineBlueprintContainer
|
2020-01-23 14:30:25 +09:00 |
|
Dean Herbert
|
9d2a46df89
|
Add beat snapping to timeline movement
|
2020-01-23 14:30:25 +09:00 |
|
Dean Herbert
|
53bdf72592
|
Allow basic timeline selection temporal movement
|
2020-01-23 14:30:25 +09:00 |
|
Dean Herbert
|
cb6e7425ae
|
Make dragbox stateful to fix blueprint movement
|
2020-01-23 14:30:25 +09:00 |
|
Dean Herbert
|
f0d810fe20
|
Follow start time and duration changes
|
2020-01-23 14:30:08 +09:00 |
|
Dean Herbert
|
63cef8b8b7
|
Rename nested classes to be more appropriate
|
2020-01-23 14:30:08 +09:00 |
|
Dean Herbert
|
89d90fdfa0
|
Fix drag not updating until mouse is moved while scrolling timeline
|
2020-01-23 14:30:07 +09:00 |
|
Dean Herbert
|
a8ec4907c4
|
Fix selections while scrolling timeline
|
2020-01-23 14:27:21 +09:00 |
|
Dean Herbert
|
c4395b1cea
|
Clean up nested class implementations
|
2020-01-23 14:27:20 +09:00 |
|
Dean Herbert
|
482409e776
|
Colour extension bars of long objects
|
2020-01-23 14:26:33 +09:00 |
|
Dean Herbert
|
a6775d1bd3
|
Implement custom drag box and allow drag seeking once again
|
2020-01-23 14:26:33 +09:00 |
|
Dean Herbert
|
83fa4a9bb3
|
Move circle size to a constant
|
2020-01-21 22:24:04 +09:00 |
|
Dean Herbert
|
a963d652bc
|
Mark readonly
|
2020-01-21 20:54:50 +09:00 |
|
Dean Herbert
|
1ce78afa98
|
Disable y offset for now
|
2020-01-21 19:51:44 +09:00 |
|
Dean Herbert
|
6187b2e77c
|
Implement IDistanceSnapProvider in timeline for now
|
2020-01-21 18:00:36 +09:00 |
|
Dean Herbert
|
353b74b04a
|
Handle selection events in timeline
|
2020-01-21 17:37:35 +09:00 |
|
Dean Herbert
|
8f16c1cb04
|
Add non-hiding selection state
|
2020-01-21 14:21:00 +09:00 |
|
Dean Herbert
|
bd96cf94a6
|
Begin refactoring SelectionBlueprint to handle non-drawable HitObjects
|
2020-01-21 12:47:14 +09:00 |
|
smoogipoo
|
bfb056c612
|
Apply input method signature refactorings
|
2020-01-20 18:17:21 +09:00 |
|
Dean Herbert
|
25aff5d96e
|
Merge remote-tracking branch 'upstream/master' into decouple-blueprint-container
|
2020-01-20 17:08:59 +09:00 |
|
Dean Herbert
|
d57f55f053
|
Apply remaining changes required to restore previous functionality
|
2020-01-15 19:09:49 +09:00 |
|
smoogipoo
|
91735ff367
|
Update MathUtils namespace usages
|
2020-01-09 13:43:44 +09:00 |
|
Dean Herbert
|
d8d12cbbdd
|
wip: Move more functionality into ComposeBlueprintContainer
|
2020-01-02 19:09:37 +09:00 |
|
smoogipoo
|
8c378dc625
|
Move EditorBeatmap construction/conversion to Editor
|
2019-12-30 14:51:14 +09:00 |
|
Dean Herbert
|
9248fbe881
|
Remove extra checkboxes for now
|
2019-12-06 12:22:44 +09:00 |
|
Dean Herbert
|
28400aa865
|
Update test scene
|
2019-12-06 11:27:24 +09:00 |
|
Dean Herbert
|
12a9843835
|
Move thickness to a constant
|
2019-12-06 10:48:18 +09:00 |
|
Dean Herbert
|
e76f8bdd64
|
Fix warnings
|
2019-12-05 23:31:21 +09:00 |
|
Dean Herbert
|
d8620a70fb
|
Make work in editor
|
2019-12-05 20:12:25 +09:00 |
|
Dean Herbert
|
e225b0032a
|
Add basic hitobject display to timeline
|
2019-12-05 19:31:40 +09:00 |
|
Berkan Diler
|
6cab517b2d
|
.NET Standard 2.1 implements Math.Clamp , use it instead of MathHelper.Clamp from osuTK.
|
2019-11-20 13:37:47 +01:00 |
|
Dean Herbert
|
1b75fbed9a
|
Merge remote-tracking branch 'upstream/master' into update-scrollcontainer
|
2019-06-14 23:25:17 +09:00 |
|
Dean Herbert
|
bc574520bf
|
Update ScrollContainer usages in line with framework changes
|
2019-06-14 15:55:32 +09:00 |
|
Dean Herbert
|
15b9b53d35
|
Fix IconButtons not being scaled correctly
|
2019-06-14 13:40:32 +09:00 |
|
smoogipoo
|
5c6b4d923f
|
Reorder methods
|
2019-05-09 13:53:53 +09:00 |
|
David Zhao
|
d625f3c104
|
Private method
|
2019-05-09 13:21:01 +09:00 |
|
David Zhao
|
ff3c226596
|
Give ZoomableScrollContainer an initial width
|
2019-05-08 13:37:03 +09:00 |
|
smoogipoo
|
0bd35ab7bb
|
Turn on warnings, resolve issues
|
2019-04-25 17:36:17 +09:00 |
|
David Zhao
|
6502e26d09
|
Add draw size invalidation to ZoomableScrollContainer
|
2019-04-19 16:21:15 +09:00 |
|
Dean Herbert
|
f1952c0816
|
Update font awesome usage
|
2019-04-02 19:55:24 +09:00 |
|
Dean Herbert
|
de80fc0eac
|
Update icon usage to match framework changes
|
2019-03-27 19:29:27 +09:00 |
|
Dean Herbert
|
5487b011d6
|
Fix some inspections rider isn't able to deal with automatically
|
2019-03-02 14:34:56 +09:00 |
|
Dean Herbert
|
0788a7e9f1
|
Merge branch 'master' into more-inspections
|
2019-02-28 14:32:57 +09:00 |
|
Dean Herbert
|
42be7857d1
|
Use expression body for property get/set where possible
|
2019-02-28 13:58:19 +09:00 |
|
Dean Herbert
|
26d53d06a9
|
Fix remaining issues
|
2019-02-28 13:31:40 +09:00 |
|
Dean Herbert
|
367bc53a06
|
Revert some more instances of 'e' variable names
|
2019-02-22 20:15:25 +09:00 |
|
Dean Herbert
|
3fe4b8fd1c
|
Update variable names
Also cleans up some weird code
|
2019-02-22 17:51:39 +09:00 |
|
smoogipoo
|
d8c55bc729
|
Adjust namespaces
|
2019-02-21 19:05:52 +09:00 |
|
smoogipoo
|
bca347427f
|
Update with framework bindable changes
|
2019-02-21 18:56:34 +09:00 |
|
Dean Herbert
|
ca5c8d37d1
|
Use leased bindables
|
2019-02-01 16:44:06 +09:00 |
|
Dean Herbert
|
8617aaa2a7
|
Update licence header (and remove year)
|
2019-01-24 17:43:03 +09:00 |
|
smoogipoo
|
f27bd3ef3e
|
OpenTK -> osuTK
|
2018-11-20 17:14:59 +09:00 |
|
smoogipoo
|
52f4923c8e
|
Remove intermediate Screens namespace
|
2018-11-06 18:28:22 +09:00 |
|