1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 06:07:28 +08:00
Commit Graph

8 Commits

Author SHA1 Message Date
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