Dean Herbert
|
48613ea1f6
|
Merge branch 'master' into timeline-markers
|
2018-06-18 02:09:20 +09:00 |
|
smoogipoo
|
08f172ba98
|
Make testcase work on appveyor (no BASS)
|
2018-06-17 19:01:18 +09:00 |
|
smoogipoo
|
0695615c6a
|
Remove MusicController from compose timeline testcase
|
2018-06-17 19:01:14 +09:00 |
|
smoogipoo
|
7dfe171869
|
Fix rebase error
|
2018-06-12 14:34:28 +09:00 |
|
smoogipoo
|
6ceac8ab0a
|
Add a centre marker to the timeline
|
2018-06-12 14:34:28 +09:00 |
|
smoogipoo
|
b90cdfbfd1
|
Remove unused variable
|
2018-06-12 14:33:33 +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 |
|
smoogipoo
|
8004b8af4d
|
Privatise the OsuGame beatmap, add local beatmap to OsuTestCase
|
2018-05-23 17:38:02 +09:00 |
|
smoogipoo
|
49f893d5e4
|
Couple the timeline to the audio
|
2018-05-23 12:00:11 +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 |
|
Dean Herbert
|
32a74f95a5
|
Normalize all the line endings
|
2018-04-13 18:26:38 +09:00 |
|
smoogipoo
|
d9e795fb9f
|
TimelineContainer -> TimelineArea
|
2018-04-05 19:40:03 +09:00 |
|
smoogipoo
|
f41d31e1db
|
ScrollableTimeline -> TimelineContainer
|
2018-04-05 19:33:25 +09:00 |
|
smoogipoo
|
870ce8868c
|
Make scrollabletimeline use gridcontainer
|
2018-04-05 16:07:33 +09:00 |
|
smoogipoo
|
3d5fefae8c
|
Add TestFixtureAttribute to all tests
|
2018-03-02 15:34:31 +09:00 |
|
Dean Herbert
|
37d393bca0
|
Update licence headers
|
2018-01-05 20:21:19 +09:00 |
|
Dean Herbert
|
dc9c474033
|
Move all TestCases to Testing project
This allows tests to successfully retrieve rulesets, as they are referenced.
|
2017-10-23 19:32:02 +09:00 |
|