smoogipoo
|
54e60d8bc2
|
Fix test appveyor tests failing due to lack of audio manager
|
2018-06-18 19:27:22 +09:00 |
|
smoogipoo
|
6d318d35ee
|
Fix not being able to seek by other means during flick-scroll
|
2018-06-18 18:56:54 +09:00 |
|
smoogipoo
|
dbc50e35d5
|
Fix the timeline and editor fighting over track seeking
|
2018-06-18 18:02:26 +09:00 |
|
Dean Herbert
|
b1d059a67d
|
Add some colours to the compose-mode timeline
|
2018-06-18 04:31:47 +09:00 |
|
Dean Herbert
|
bec6e3083e
|
Remove scrollbar depth change as scrollbar is hidden now
|
2018-06-18 03:19:21 +09:00 |
|
Dean Herbert
|
d58ef96a23
|
Merge branch 'master' into timeline-markers
|
2018-06-18 03:14:04 +09:00 |
|
Dean Herbert
|
31f9d0161d
|
Add a comment about precision scroll behaviour
|
2018-06-18 03:03:09 +09:00 |
|
smoogipoo
|
3b396e38ca
|
Hide the scrollbar
|
2018-06-12 15:51:48 +09:00 |
|
smoogipoo
|
aaf2f66594
|
Make scrolling only zoom the timeline
|
2018-06-12 15:51:36 +09:00 |
|
smoogipoo
|
6ceac8ab0a
|
Add a centre marker to the timeline
|
2018-06-12 14:34:28 +09:00 |
|
smoogipoo
|
30b7b7961f
|
Merge remote-tracking branch 'origin/master' into timeline-audio-scrolling
# Conflicts:
# osu-framework
# osu.Game.Tests/Visual/TestCaseEditorComposeTimeline.cs
# osu.Game/Screens/Edit/Screens/Compose/Timeline/Timeline.cs
|
2018-06-12 14:22:27 +09:00 |
|
Dean Herbert
|
8092d70402
|
Merge remote-tracking branch 'upstream/master' into smoogipoo-editor-timeline-rework
|
2018-06-11 20:17:33 +09:00 |
|
Dean Herbert
|
475fb06559
|
Use new bind method
|
2018-06-07 16:46:54 +09:00 |
|
smoogipoo
|
72cc53aded
|
Rename GameBeatmap -> BindableBeatmap
|
2018-06-06 20:16:20 +09:00 |
|
smoogipoo
|
4086ff7313
|
Merge remote-tracking branch 'origin/master' into disallow-beatmap-change
# Conflicts:
# osu.Game.Tests/Visual/TestCaseBeatmapInfoWedge.cs
# osu.Game/Screens/Menu/Intro.cs
# osu.Game/Screens/Menu/MenuSideFlashes.cs
|
2018-06-06 18:26:51 +09:00 |
|
Dean Herbert
|
64eda27547
|
Update framework
|
2018-06-03 03:05:53 +09:00 |
|
smoogipoo
|
a3470f9ec3
|
Merge remote-tracking branch 'origin/master' into disallow-beatmap-change
# Conflicts:
# osu.Game/Overlays/Music/PlaylistOverlay.cs
# osu.Game/Screens/OsuScreen.cs
|
2018-05-28 18:01:15 +09:00 |
|
Dean Herbert
|
699f661b02
|
Merge remote-tracking branch 'upstream/master' into AlFasGD-editor-seekbar-fix
|
2018-05-25 19:07:30 +09:00 |
|
smoogipoo
|
b649025e86
|
beginUserDrag/endUserDrag
|
2018-05-24 14:36:48 +09:00 |
|
smoogipoo
|
d4f68e0b67
|
Fix possible NaN values due to trackvirtual infinite length
|
2018-05-24 14:31:31 +09:00 |
|
smoogipoo
|
f1ac84d95b
|
Fix base.CreateLocalDependencies sometimes not being called
|
2018-05-24 13:03:25 +09:00 |
|
smoogipoo
|
a5d2d74447
|
Remove whitespace
|
2018-05-23 19:01:27 +09:00 |
|
smoogipoo
|
8004b8af4d
|
Privatise the OsuGame beatmap, add local beatmap to OsuTestCase
|
2018-05-23 17:38:02 +09:00 |
|
smoogipoo
|
a30f72b477
|
Add helper methods for seeking/scrolling
|
2018-05-23 14:32:00 +09:00 |
|
smoogipoo
|
6b0eeb3436
|
Rework seeking interactions to support smooth scrolling
|
2018-05-23 14:14:32 +09:00 |
|
smoogipoo
|
49f893d5e4
|
Couple the timeline to the audio
|
2018-05-23 12:00:11 +09:00 |
|
smoogipoo
|
1dfa3ff995
|
Merge remote-tracking branch 'origin/master' into editor-timeline-rework
|
2018-05-22 18:30:29 +09:00 |
|
Aergwyn
|
b7e3ea348b
|
expose two Bindables with split logic instead of one with mixed logic
|
2018-05-21 15:53:55 +02:00 |
|
AlFasGD
|
a54bda6ce1
|
Apply requested changes
|
2018-05-21 13:23:39 +03:00 |
|
Aergwyn
|
1482bca147
|
Rename for better understanding
ShowOverlays -> AllowOverlays
ShowOverlaysOnEnter -> HideOverlaysOnEnter
|
2018-05-21 09:42:29 +02:00 |
|
smoogipoo
|
82607b3eb3
|
Expose properties to control zoom
|
2018-05-18 17:53:09 +09:00 |
|
smoogipoo
|
bc3d195aa2
|
Fix line endings
|
2018-05-18 13:05:58 +09:00 |
|
smoogipoo
|
3f365c6621
|
Merge branch 'master' into editor-timeline-rework
# Conflicts:
# osu.Game.Tests/Visual/TestCaseEditorComposeTimeline.cs
# osu.Game/Screens/Edit/Screens/Compose/Compose.cs
# osu.Game/Screens/Edit/Screens/Compose/Timeline/ScrollableTimeline.cs
# osu.Game/Screens/Edit/Screens/Compose/Timeline/ScrollingTimelineContainer.cs
|
2018-05-16 18:04:24 +09:00 |
|
AlFasGD
|
2a90686da6
|
Simplify expression
|
2018-05-12 15:09:53 +03:00 |
|
AlFasGD
|
e44062b77a
|
Fix tests and implementation
|
2018-05-08 16:37:06 +03:00 |
|
AlFasGD
|
dd9b9a18ac
|
Prevent user from scrolling outside the timeline in the editor
|
2018-05-08 16:21:54 +03:00 |
|
smoogipoo
|
674e45d49b
|
Fix beatmap/ruleset being changeable while in the editor
|
2018-05-07 16:32:15 +09:00 |
|
Dean Herbert
|
93b77d9cfe
|
Remove annotation
|
2018-04-23 22:22:31 +09:00 |
|
Dean Herbert
|
ff3d3379f0
|
Merge remote-tracking branch 'upstream/master' into async-screens
|
2018-04-23 18:29:37 +09:00 |
|
Dean Herbert
|
194992936d
|
Use exceptions
|
2018-04-23 17:57:47 +09:00 |
|
Dean Herbert
|
6e16f2a3c3
|
Add assert to appease rider/r#
|
2018-04-23 15:03:41 +09:00 |
|
Dean Herbert
|
e9e97f31d6
|
Merge remote-tracking branch 'upstream/master' into peppy-async-screens
|
2018-04-20 19:06:47 +09:00 |
|
smoogipoo
|
0dce7a5b61
|
Update framework + fix CI errors
|
2018-04-20 18:19:17 +09:00 |
|
Dean Herbert
|
de85436534
|
Merge remote-tracking branch 'upstream/master' into peppy-async-screens
|
2018-04-20 16:52:58 +09:00 |
|
Dean Herbert
|
32a74f95a5
|
Normalize all the line endings
|
2018-04-13 18:26:38 +09:00 |
|
Dean Herbert
|
127f0d7b01
|
Fix smoogipoo's comments
|
2018-04-12 21:17:17 +09:00 |
|
Dean Herbert
|
0ca703beaa
|
Add some missing xmldoc
|
2018-04-12 21:04:45 +09:00 |
|
smoogipoo
|
a2484fbf56
|
Move back to DI-ing adjustable clock into SummaryTimeline
|
2018-04-12 13:37:02 +09:00 |
|
smoogipoo
|
fbc50d6030
|
Merge master into editor-clock
|
2018-04-12 13:35:53 +09:00 |
|
smoogipoo
|
e59124962c
|
Remove re-instantiation of clock in EditorClockTestCase
|
2018-04-06 18:38:44 +09:00 |
|