20 Commits

• Remove intermediate Screens namespace
  smoogipoo · 2018-11-06 18:28:22 +09:00
  52f4923c8e
• Renamespace compose-mode components
  smoogipoo · 2018-11-06 18:14:46 +09:00
  ac25718c5a
• Merge branch 'master' into timeline-markers
  Dean Herbert · 2018-06-18 02:09:20 +09:00
  48613ea1f6
• Make testcase work on appveyor (no BASS)
  smoogipoo · 2018-06-17 19:01:18 +09:00
  08f172ba98
• Remove MusicController from compose timeline testcase
  smoogipoo · 2018-06-17 19:01:14 +09:00
  0695615c6a
• Fix rebase error
  smoogipoo · 2018-06-12 14:34:28 +09:00
  7dfe171869
• Add a centre marker to the timeline
  smoogipoo · 2018-06-12 14:34:28 +09:00
  6ceac8ab0a
• Remove unused variable
  smoogipoo · 2018-06-12 14:33:33 +09:00
  b90cdfbfd1
• 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

  smoogipoo · 2018-06-12 14:22:27 +09:00
  30b7b7961f
• Merge remote-tracking branch 'upstream/master' into smoogipoo-editor-timeline-rework
  Dean Herbert · 2018-06-11 20:17:33 +09:00
  8092d70402
• Privatise the OsuGame beatmap, add local beatmap to OsuTestCase
  smoogipoo · 2018-05-23 17:38:02 +09:00
  8004b8af4d
• Couple the timeline to the audio
  smoogipoo · 2018-05-23 12:00:11 +09:00
  49f893d5e4
• 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

  smoogipoo · 2018-05-16 18:04:24 +09:00
  3f365c6621
• Normalize all the line endings
  Dean Herbert · 2018-04-13 18:26:38 +09:00
  32a74f95a5
• TimelineContainer -> TimelineArea
  smoogipoo · 2018-04-05 19:40:03 +09:00
  d9e795fb9f
• ScrollableTimeline -> TimelineContainer
  smoogipoo · 2018-04-05 19:33:25 +09:00
  f41d31e1db
• Make scrollabletimeline use gridcontainer
  smoogipoo · 2018-04-05 16:07:33 +09:00
  870ce8868c
• Add TestFixtureAttribute to all tests
  smoogipoo · 2018-03-02 15:34:31 +09:00
  3d5fefae8c
• Update licence headers
  Dean Herbert · 2018-01-05 20:21:19 +09:00
  37d393bca0
• Move all TestCases to Testing project

  This allows tests to successfully retrieve rulesets, as they are referenced.

  Dean Herbert · 2017-10-23 19:32:02 +09:00
  dc9c474033