Merge pull request #1075 from peppy/import-from-stable-part-two

Tidy up osu-stable import process

.vscode/tasks.json

@@ -9,15 +9,9 @@
     "showOutput": "silent",
     "args": [
         "/property:GenerateFullPaths=true",
-        "/property:DebugType=portable"
+        "/property:DebugType=portable",
+        "/m" //parallel compiling support.
     ],
-    "windows": {
-        "args": [
-            "/property:GenerateFullPaths=true",
-            "/property:DebugType=portable",
-            "/m" //parallel compiling support. doesn't work well with mono atm
-        ]
-    },
     "tasks": [
         {
             "taskName": "Build (Debug)",

osu.Desktop.Deploy/App.config

@@ -31,6 +31,10 @@ Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/maste
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="SharpCompress" publicKeyToken="afb0a02973931d96" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-0.17.1.0" newVersion="0.17.1.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>

osu.Desktop.Deploy/osu.Desktop.Deploy.csproj

@@ -49,10 +49,6 @@
       <HintPath>$(SolutionDir)\packages\DeltaCompressionDotNet.1.1.0\lib\net20\DeltaCompressionDotNet.PatchApi.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\squirrel.windows.1.5.2\lib\Net45\ICSharpCode.SharpZipLib.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="Mono.Cecil, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
       <HintPath>$(SolutionDir)\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.dll</HintPath>
       <Private>True</Private>
@@ -73,15 +69,19 @@
       <HintPath>$(SolutionDir)\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="NuGet.Squirrel, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\squirrel.windows.1.5.2\lib\Net45\NuGet.Squirrel.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\squirrel.windows.1.7.5\lib\Net45\NuGet.Squirrel.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="SharpCompress, Version=0.17.1.0, Culture=neutral, PublicKeyToken=afb0a02973931d96, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\SharpCompress.0.17.1\lib\net45\SharpCompress.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Splat, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>$(SolutionDir)\packages\Splat.2.0.0\lib\Net45\Splat.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Squirrel, Version=1.5.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\squirrel.windows.1.5.2\lib\Net45\Squirrel.dll</HintPath>
+    <Reference Include="Squirrel, Version=1.7.5.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\squirrel.windows.1.7.5\lib\Net45\Squirrel.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />

osu.Desktop.Deploy/packages.config

@@ -7,7 +7,8 @@ Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/maste
   <package id="DeltaCompressionDotNet" version="1.1.0" targetFramework="net452" />
   <package id="Mono.Cecil" version="0.9.6.4" targetFramework="net452" />
   <package id="Newtonsoft.Json" version="10.0.2" targetFramework="net452" />
-  <package id="NuGet.CommandLine" version="3.5.0" targetFramework="net452" developmentDependency="true" />
+  <package id="NuGet.CommandLine" version="4.1.0" targetFramework="net452" developmentDependency="true" />
+  <package id="SharpCompress" version="0.17.1" targetFramework="net452" />
   <package id="Splat" version="2.0.0" targetFramework="net452" />
-  <package id="squirrel.windows" version="1.5.2" targetFramework="net452" />
+  <package id="squirrel.windows" version="1.7.5" targetFramework="net452" />
 </packages>

osu.Desktop.Tests/app.config

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>

osu.Desktop.Tests/osu.Desktop.Tests.csproj

@@ -37,8 +37,9 @@
     <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>$(SolutionDir)\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.framework, Version=3.6.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=3.7.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\NUnit.3.7.1\lib\net45\nunit.framework.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="SQLite.Net, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -100,6 +101,7 @@
     <None Include="..\osu.licenseheader">
       <Link>osu.licenseheader</Link>
     </None>
+    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>

osu.Desktop.Tests/packages.config

@@ -5,7 +5,7 @@ Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/maste
 -->
 <packages>
   <package id="Newtonsoft.Json" version="10.0.2" targetFramework="net45" />
-  <package id="NUnit" version="3.6.1" targetFramework="net45" />
+  <package id="NUnit" version="3.7.1" targetFramework="net45" />
   <package id="SQLite.Net.Core-PCL" version="3.1.1" targetFramework="net45" />
   <package id="SQLite.Net-PCL" version="3.1.1" targetFramework="net45" />
   <package id="SQLiteNetExtensions" version="1.3.0" targetFramework="net45" />

osu.Desktop.VisualTests/Tests/TestCaseBeatSyncedContainer.cs

@@ -0,0 +1,206 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Testing;
+using osu.Framework.Graphics;
+using osu.Framework.Timing;
+using osu.Game.Overlays;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics.Containers;
+using osu.Framework.Audio.Track;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Framework.Graphics.Shapes;
+using OpenTK.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Framework.Lists;
+using System;
+using osu.Framework.Extensions.Color4Extensions;
+
+namespace osu.Desktop.VisualTests.Tests
+{
+    internal class TestCaseBeatSyncedContainer : TestCase
+    {
+        public override string Description => @"Tests beat synced containers.";
+
+        private readonly MusicController mc;
+
+        public TestCaseBeatSyncedContainer()
+        {
+            Clock = new FramedClock();
+            Clock.ProcessFrame();
+
+            Add(new BeatContainer
+            {
+                Anchor = Anchor.BottomCentre,
+                Origin = Anchor.BottomCentre,
+            });
+
+            Add(mc = new MusicController
+            {
+                Origin = Anchor.TopRight,
+                Anchor = Anchor.TopRight,
+            });
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            mc.ToggleVisibility();
+        }
+
+        private class BeatContainer : BeatSyncedContainer
+        {
+            private const int flash_layer_heigth = 150;
+
+            private readonly InfoString timingPointCount;
+            private readonly InfoString currentTimingPoint;
+            private readonly InfoString beatCount;
+            private readonly InfoString currentBeat;
+            private readonly InfoString beatsPerMinute;
+            private readonly InfoString adjustedBeatLength;
+            private readonly InfoString timeUntilNextBeat;
+            private readonly InfoString timeSinceLastBeat;
+
+            private readonly Box flashLayer;
+
+            public BeatContainer()
+            {
+                RelativeSizeAxes = Axes.X;
+                AutoSizeAxes = Axes.Y;
+                Children = new Drawable[]
+                {
+                    new Container
+                    {
+                        Name = @"Info Layer",
+                        Anchor = Anchor.BottomLeft,
+                        Origin = Anchor.BottomLeft,
+                        AutoSizeAxes = Axes.Both,
+                        Margin = new MarginPadding { Bottom = flash_layer_heigth },
+                        Children = new Drawable[]
+                        {
+                            new Box
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Colour = Color4.Black.Opacity(150),
+                            },
+                            new FillFlowContainer
+                            {
+                                Anchor = Anchor.BottomLeft,
+                                Origin = Anchor.BottomLeft,
+                                AutoSizeAxes = Axes.Both,
+                                Direction = FillDirection.Vertical,
+                                Children = new Drawable[]
+                                {
+                                    timingPointCount = new InfoString(@"Timing points amount"),
+                                    currentTimingPoint = new InfoString(@"Current timing point"),
+                                    beatCount = new InfoString(@"Beats amount (in the current timing point)"),
+                                    currentBeat = new InfoString(@"Current beat"),
+                                    beatsPerMinute = new InfoString(@"BPM"),
+                                    adjustedBeatLength = new InfoString(@"Adjusted beat length"),
+                                    timeUntilNextBeat = new InfoString(@"Time until next beat"),
+                                    timeSinceLastBeat = new InfoString(@"Time since last beat"),
+                                }
+                            }
+                        }
+                    },
+                    new Container
+                    {
+                        Name = @"Color indicator",
+                        Anchor = Anchor.BottomCentre,
+                        Origin = Anchor.BottomCentre,
+                        RelativeSizeAxes = Axes.X,
+                        Height = flash_layer_heigth,
+                        Children = new Drawable[]
+                        {
+                            new Box
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Colour = Color4.Black,
+                            },
+                            flashLayer = new Box
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Colour = Color4.White,
+                                Alpha = 0,
+                            }
+                        }
+                    }
+                };
+
+                Beatmap.ValueChanged += delegate
+                {
+                    timingPointCount.Value = 0;
+                    currentTimingPoint.Value = 0;
+                    beatCount.Value = 0;
+                    currentBeat.Value = 0;
+                    beatsPerMinute.Value = 0;
+                    adjustedBeatLength.Value = 0;
+                    timeUntilNextBeat.Value = 0;
+                    timeSinceLastBeat.Value = 0;
+                };
+            }
+
+            private SortedList<TimingControlPoint> timingPoints => Beatmap.Value.Beatmap.ControlPointInfo.TimingPoints;
+            private TimingControlPoint getNextTimingPoint(TimingControlPoint current)
+            {
+                if (timingPoints[timingPoints.Count - 1] == current)
+                    return current;
+
+                return timingPoints[timingPoints.IndexOf(current) + 1];
+            }
+
+            private int calculateBeatCount(TimingControlPoint current)
+            {
+                if (timingPoints.Count == 0) return 0;
+
+                if (timingPoints[timingPoints.Count - 1] == current)
+                    return (int)Math.Ceiling((Beatmap.Value.Track.Length - current.Time) / current.BeatLength);
+
+                return (int)Math.Ceiling((getNextTimingPoint(current).Time - current.Time) / current.BeatLength);
+            }
+
+            protected override void Update()
+            {
+                base.Update();
+                timeUntilNextBeat.Value = TimeUntilNextBeat;
+                timeSinceLastBeat.Value = TimeSinceLastBeat;
+            }
+
+            protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, TrackAmplitudes amplitudes)
+            {
+                base.OnNewBeat(beatIndex, timingPoint, effectPoint, amplitudes);
+
+                timingPointCount.Value = timingPoints.Count;
+                currentTimingPoint.Value = timingPoints.IndexOf(timingPoint);
+                beatCount.Value = calculateBeatCount(timingPoint);
+                currentBeat.Value = beatIndex;
+                beatsPerMinute.Value = 60000 / timingPoint.BeatLength;
+                adjustedBeatLength.Value = timingPoint.BeatLength;
+
+                flashLayer.FadeOutFromOne(timingPoint.BeatLength);
+            }
+        }
+
+        private class InfoString : FillFlowContainer
+        {
+            private const int text_size = 20;
+            private const int margin = 7;
+
+            private readonly OsuSpriteText valueText;
+
+            public double Value
+            {
+                set { valueText.Text = $"{value:G}"; }
+            }
+
+            public InfoString(string header)
+            {
+                AutoSizeAxes = Axes.Both;
+                Direction = FillDirection.Horizontal;
+                Add(new OsuSpriteText { Text = header + @": ", TextSize = text_size });
+                Add(valueText = new OsuSpriteText { TextSize = text_size });
+                Margin = new MarginPadding(margin);
+            }
+        }
+    }
+}

osu.Desktop.VisualTests/Tests/TestCaseBeatmapDetailArea.cs

@@ -12,10 +12,8 @@ namespace osu.Desktop.VisualTests.Tests
     {
         public override string Description => @"Beatmap details in song select";
 
-        public override void Reset()
+        public TestCaseBeatmapDetailArea()
         {
-            base.Reset();
-
             Add(new BeatmapDetailArea
             {
                 Anchor = Anchor.Centre,

osu.Desktop.VisualTests/Tests/TestCaseBeatmapDetails.cs

@@ -3,9 +3,9 @@
 
 using osu.Framework.Graphics;
 using osu.Framework.Testing;
-using osu.Game.Database;
 using osu.Game.Screens.Select;
 using System.Linq;
+using osu.Game.Beatmaps;
 
 namespace osu.Desktop.VisualTests.Tests
 {
@@ -13,12 +13,10 @@ namespace osu.Desktop.VisualTests.Tests
     {
         public override string Description => "BeatmapDetails tab of BeatmapDetailArea";
 
-        private BeatmapDetails details;
+        private readonly BeatmapDetails details;
 
-        public override void Reset()
+        public TestCaseBeatmapDetails()
         {
-            base.Reset();
-
             Add(details = new BeatmapDetails
             {
                 RelativeSizeAxes = Axes.Both,

osu.Desktop.VisualTests/Tests/TestCaseBeatmapOptionsOverlay.cs

@@ -13,10 +13,8 @@ namespace osu.Desktop.VisualTests.Tests
     {
         public override string Description => @"Beatmap options in song select";
 
-        public override void Reset()
+        public TestCaseBeatmapOptionsOverlay()
         {
-            base.Reset();
-
             var overlay = new BeatmapOptionsOverlay();
 
             overlay.AddButton(@"Remove", @"from unplayed", FontAwesome.fa_times_circle_o, Color4.Purple, null, Key.Number1);

osu.Desktop.VisualTests/Tests/TestCaseBreadcrumbs.cs

@@ -11,10 +11,8 @@ namespace osu.Desktop.VisualTests.Tests
     {
         public override string Description => @"breadcrumb > control";
 
-        public override void Reset()
+        public TestCaseBreadcrumbs()
         {
-            base.Reset();
-
             BreadcrumbControl<BreadcrumbTab> c;
             Add(c = new BreadcrumbControl<BreadcrumbTab>
             {

osu.Desktop.VisualTests/Tests/TestCaseChatDisplay.cs

@@ -11,10 +11,8 @@ namespace osu.Desktop.VisualTests.Tests
     {
         public override string Description => @"Testing chat api and overlay";
 
-        public override void Reset()
+        public TestCaseChatDisplay()
         {
-            base.Reset();
-
             Add(new ChatOverlay
             {
                 State = Visibility.Visible

osu.Desktop.VisualTests/Tests/TestCaseContextMenu.cs

@@ -0,0 +1,98 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using OpenTK;
+using OpenTK.Graphics;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Cursor;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Testing;
+using osu.Game.Graphics.UserInterface;
+
+namespace osu.Desktop.VisualTests.Tests
+{
+    internal class TestCaseContextMenu : TestCase
+    {
+        public override string Description => @"Menu visible on right click";
+
+        private const int start_time = 0;
+        private const int duration = 1000;
+
+        private readonly Container container;
+
+        public TestCaseContextMenu()
+        {
+            Add(container = new MyContextMenuContainer
+            {
+                Size = new Vector2(200),
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Children = new Drawable[]
+                {
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = Color4.Green,
+                    }
+                }
+            });
+
+            Add(new AnotherContextMenuContainer
+            {
+                Size = new Vector2(200),
+                Anchor = Anchor.CentreLeft,
+                Origin = Anchor.CentreLeft,
+                Children = new Drawable[]
+                {
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = Color4.Red,
+                    }
+                }
+            });
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            // Move box along a square trajectory
+            container.Loop(c => c
+                .MoveTo(new Vector2(0, 100), duration).Then()
+                .MoveTo(new Vector2(100, 100), duration).Then()
+                .MoveTo(new Vector2(100, 0), duration).Then()
+                .MoveTo(Vector2.Zero, duration)
+            );
+        }
+
+        private class MyContextMenuContainer : Container, IHasContextMenu
+        {
+            public ContextMenuItem[] ContextMenuItems => new ContextMenuItem[]
+            {
+                new OsuContextMenuItem(@"Some option"),
+                new OsuContextMenuItem(@"Highlighted option", MenuItemType.Highlighted),
+                new OsuContextMenuItem(@"Another option"),
+                new OsuContextMenuItem(@"Choose me please"),
+                new OsuContextMenuItem(@"And me too"),
+                new OsuContextMenuItem(@"Trying to fill"),
+                new OsuContextMenuItem(@"Destructive option", MenuItemType.Destructive),
+            };
+        }
+
+        private class AnotherContextMenuContainer : Container, IHasContextMenu
+        {
+            public ContextMenuItem[] ContextMenuItems => new ContextMenuItem[]
+            {
+                new OsuContextMenuItem(@"Simple option"),
+                new OsuContextMenuItem(@"Simple very very long option"),
+                new OsuContextMenuItem(@"Change width", MenuItemType.Highlighted) { Action = () => this.ResizeWidthTo(Width * 2, 100, Easing.OutQuint) },
+                new OsuContextMenuItem(@"Change height", MenuItemType.Highlighted) { Action = () => this.ResizeHeightTo(Height * 2, 100, Easing.OutQuint) },
+                new OsuContextMenuItem(@"Change width back", MenuItemType.Destructive) { Action = () => this.ResizeWidthTo(Width / 2, 100, Easing.OutQuint) },
+                new OsuContextMenuItem(@"Change height back", MenuItemType.Destructive) { Action = () => this.ResizeHeightTo(Height / 2, 100, Easing.OutQuint) },
+            };
+        }
+    }
+}

osu.Desktop.VisualTests/Tests/TestCaseDialogOverlay.cs

@@ -12,11 +12,9 @@ namespace osu.Desktop.VisualTests.Tests
     {
         public override string Description => @"Display dialogs";
 
-        private DialogOverlay overlay;
-
-        public override void Reset()
+        public TestCaseDialogOverlay()
         {
-            base.Reset();
+            DialogOverlay overlay;
 
             Add(overlay = new DialogOverlay());
 

osu.Desktop.VisualTests/Tests/TestCaseDirect.cs

@@ -4,8 +4,9 @@
 using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Testing;
-using osu.Game.Database;
+using osu.Game.Beatmaps;
 using osu.Game.Overlays;
+using osu.Game.Rulesets;
 
 namespace osu.Desktop.VisualTests.Tests
 {
@@ -14,11 +15,11 @@ namespace osu.Desktop.VisualTests.Tests
         public override string Description => @"osu!direct overlay";
 
         private DirectOverlay direct;
-        private RulesetDatabase rulesets;
+        private RulesetStore rulesets;
 
-        public override void Reset()
+        protected override void LoadComplete()
         {
-            base.Reset();
+            base.LoadComplete();
 
             Add(direct = new DirectOverlay());
             newBeatmaps();
@@ -28,7 +29,7 @@ namespace osu.Desktop.VisualTests.Tests
         }
 
         [BackgroundDependencyLoader]
-        private void load(RulesetDatabase rulesets)
+        private void load(RulesetStore rulesets)
         {
             this.rulesets = rulesets;
         }
@@ -48,6 +49,17 @@ namespace osu.Desktop.VisualTests.Tests
                         Author = @"RLC",
                         Source = @"",
                     },
+                    OnlineInfo = new BeatmapSetOnlineInfo
+                    {
+                        Covers = new BeatmapSetOnlineCovers
+                        {
+                            Card = @"https://assets.ppy.sh/beatmaps/578332/covers/card.jpg?1494591390",
+                            Cover = @"https://assets.ppy.sh/beatmaps/578332/covers/cover.jpg?1494591390",
+                        },
+                        Preview = @"https://b.ppy.sh/preview/578332.mp3",
+                        PlayCount = 97,
+                        FavouriteCount = 72,
+                    },
                     Beatmaps = new List<BeatmapInfo>
                     {
                         new BeatmapInfo
@@ -55,13 +67,6 @@ namespace osu.Desktop.VisualTests.Tests
                             Ruleset = ruleset,
                             StarDifficulty = 5.35f,
                             Metadata = new BeatmapMetadata(),
-                            OnlineInfo = new BeatmapOnlineInfo
-                            {
-                                Covers = new[] { @"https://assets.ppy.sh//beatmaps/578332/covers/cover.jpg?1494591390" },
-                                Preview = @"https://b.ppy.sh/preview/578332.mp3",
-                                PlayCount = 97,
-                                FavouriteCount = 72,
-                            },
                         },
                     },
                 },
@@ -74,6 +79,17 @@ namespace osu.Desktop.VisualTests.Tests
                         Author = @"Sotarks",
                         Source = @"ぎんぎつね",
                     },
+                    OnlineInfo = new BeatmapSetOnlineInfo
+                    {
+                        Covers = new BeatmapSetOnlineCovers
+                        {
+                            Card = @"https://assets.ppy.sh/beatmaps/599627/covers/card.jpg?1494539318",
+                            Cover = @"https://assets.ppy.sh/beatmaps/599627/covers/cover.jpg?1494539318",
+                        },
+                        Preview = @"https//b.ppy.sh/preview/599627.mp3",
+                        PlayCount = 3082,
+                        FavouriteCount = 14,
+                    },
                     Beatmaps = new List<BeatmapInfo>
                     {
                         new BeatmapInfo
@@ -81,13 +97,6 @@ namespace osu.Desktop.VisualTests.Tests
                             Ruleset = ruleset,
                             StarDifficulty = 5.81f,
                             Metadata = new BeatmapMetadata(),
-                            OnlineInfo = new BeatmapOnlineInfo
-                            {
-                                Covers = new[] { @"https://assets.ppy.sh//beatmaps/599627/covers/cover.jpg?1494539318" },
-                                Preview = @"https//b.ppy.sh/preview/599627.mp3",
-                                PlayCount = 3082,
-                                FavouriteCount = 14,
-                            },
                         },
                     },
                 },
@@ -100,6 +109,17 @@ namespace osu.Desktop.VisualTests.Tests
                         Author = @"Cerulean Veyron",
                         Source = @"",
                     },
+                    OnlineInfo = new BeatmapSetOnlineInfo
+                    {
+                        Covers = new BeatmapSetOnlineCovers
+                        {
+                            Card = @"https://assets.ppy.sh/beatmaps/513268/covers/card.jpg?1494502863",
+                            Cover = @"https://assets.ppy.sh/beatmaps/513268/covers/cover.jpg?1494502863",
+                        },
+                        Preview = @"https//b.ppy.sh/preview/513268.mp3",
+                        PlayCount = 2762,
+                        FavouriteCount = 15,
+                    },
                     Beatmaps = new List<BeatmapInfo>
                     {
                         new BeatmapInfo
@@ -107,13 +127,6 @@ namespace osu.Desktop.VisualTests.Tests
                             Ruleset = ruleset,
                             StarDifficulty = 0.9f,
                             Metadata = new BeatmapMetadata(),
-                            OnlineInfo = new BeatmapOnlineInfo
-                            {
-                                Covers = new[] { @"https://assets.ppy.sh//beatmaps/513268/covers/cover.jpg?1494502863" },
-                                Preview = @"https//b.ppy.sh/preview/513268.mp3",
-                                PlayCount = 2762,
-                                FavouriteCount = 15,
-                            },
                         },
                         new BeatmapInfo
                         {
@@ -141,6 +154,17 @@ namespace osu.Desktop.VisualTests.Tests
                         Author = @"[Kamiya]",
                         Source = @"小林さんちのメイドラゴン",
                     },
+                    OnlineInfo = new BeatmapSetOnlineInfo
+                    {
+                        Covers = new BeatmapSetOnlineCovers
+                        {
+                            Card = @"https://assets.ppy.sh/beatmaps/586841/covers/card.jpg?1494052741",
+                            Cover = @"https://assets.ppy.sh/beatmaps/586841/covers/cover.jpg?1494052741",
+                        },
+                        Preview = @"https//b.ppy.sh/preview/586841.mp3",
+                        PlayCount = 62317,
+                        FavouriteCount = 161,
+                    },
                     Beatmaps = new List<BeatmapInfo>
                     {
                         new BeatmapInfo
@@ -148,13 +172,6 @@ namespace osu.Desktop.VisualTests.Tests
                             Ruleset = ruleset,
                             StarDifficulty = 1.26f,
                             Metadata = new BeatmapMetadata(),
-                            OnlineInfo = new BeatmapOnlineInfo
-                            {
-                                Covers = new[] { @"https://assets.ppy.sh//beatmaps/586841/covers/cover.jpg?1494052741" },
-                                Preview = @"https//b.ppy.sh/preview/586841.mp3",
-                                PlayCount = 62317,
-                                FavouriteCount = 161,
-                            },
                         },
                         new BeatmapInfo
                         {

osu.Desktop.VisualTests/Tests/TestCaseDrawableRoom.cs

@@ -7,7 +7,9 @@ using osu.Framework.Testing;
 using osu.Game.Screens.Multiplayer;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Users;
-using osu.Game.Database;
+using osu.Framework.Allocation;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets;
 
 namespace osu.Desktop.VisualTests.Tests
 {
@@ -15,60 +17,117 @@ namespace osu.Desktop.VisualTests.Tests
     {
         public override string Description => @"Select your favourite room";
 
-        public override void Reset()
+        private RulesetStore rulesets;
+
+        protected override void LoadComplete()
         {
-            base.Reset();
+            base.LoadComplete();
 
             DrawableRoom first;
-            DrawableRoom second;
             Add(new FillFlowContainer
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
                 AutoSizeAxes = Axes.Y,
-                Width = 500f,
+                Width = 580f,
                 Direction = FillDirection.Vertical,
                 Children = new Drawable[]
                 {
-                    first = new DrawableRoom(new Room()),
-                    second = new DrawableRoom(new Room()),
+                    first = new DrawableRoom(new Room
+                    {
+                        Name = { Value = @"Great Room Right Here" },
+                        Host = { Value = new User { Username = @"Naeferith", Id = 9492835, Country = new Country { FlagName = @"FR" } } },
+                        Status = { Value = new RoomStatusOpen() },
+                        Type = { Value = new GameTypeTeamVersus() },
+                        Beatmap =
+                        {
+                            Value = new BeatmapInfo
+                            {
+                                StarDifficulty = 4.65,
+                                Ruleset = rulesets.GetRuleset(3),
+                                Metadata = new BeatmapMetadata
+                                {
+                                    Title = @"Critical Crystal",
+                                    Artist = @"Seiryu",
+                                },
+                                BeatmapSet = new BeatmapSetInfo
+                                {
+                                    OnlineInfo = new BeatmapSetOnlineInfo
+                                    {
+                                        Covers = new BeatmapSetOnlineCovers
+                                        {
+                                            Cover = @"https://assets.ppy.sh//beatmaps/376340/covers/cover.jpg?1456478455",
+                                        },
+                                    },
+                                },
+                            },
+                        },
+                        Participants =
+                        {
+                            Value = new[]
+                            {
+                                new User { GlobalRank = 1355 },
+                                new User { GlobalRank = 8756 },
+                            },
+                        },
+                    }),
+                    new DrawableRoom(new Room
+                    {
+                        Name = { Value = @"Relax It's The Weekend" },
+                        Host = { Value = new User { Username = @"peppy", Id = 2, Country = new Country { FlagName = @"AU" } } },
+                        Status = { Value = new RoomStatusPlaying() },
+                        Type = { Value = new GameTypeTagTeam() },
+                        Beatmap =
+                        {
+                            Value = new BeatmapInfo
+                            {
+                                StarDifficulty = 1.96,
+                                Ruleset = rulesets.GetRuleset(0),
+                                Metadata = new BeatmapMetadata
+                                {
+                                    Title = @"Serendipity",
+                                    Artist = @"ZAQ",
+                                },
+                                BeatmapSet = new BeatmapSetInfo
+                                {
+                                    OnlineInfo = new BeatmapSetOnlineInfo
+                                    {
+                                        Covers = new BeatmapSetOnlineCovers
+                                        {
+                                            Cover = @"https://assets.ppy.sh//beatmaps/526839/covers/cover.jpg?1493815706",
+                                        },
+                                    },
+                                },
+                            },
+                        },
+                        Participants =
+                        {
+                            Value =  new[]
+                            {
+                                new User { GlobalRank = 578975 },
+                                new User { GlobalRank = 24554 },
+                            },
+                        },
+                    }),
                 }
             });
 
-            first.Room.Name.Value = @"Great Room Right Here";
-            first.Room.Host.Value = new User { Username = @"Naeferith", Id = 9492835, Country = new Country { FlagName = @"FR" } };
-            first.Room.Status.Value = new RoomStatusOpen();
-            first.Room.Beatmap.Value = new BeatmapMetadata { Title = @"Seiryu", Artist = @"Critical Crystal" };
-
-            second.Room.Name.Value = @"Relax It's The Weekend";
-            second.Room.Host.Value = new User { Username = @"peppy", Id = 2, Country = new Country { FlagName = @"AU" } };
-            second.Room.Status.Value = new RoomStatusPlaying();
-            second.Room.Beatmap.Value = new BeatmapMetadata { Title = @"ZAQ", Artist = @"Serendipity" };
-
-            AddStep(@"change state", () =>
+            AddStep(@"change title", () => first.Room.Name.Value = @"I Changed Name");
+            AddStep(@"change host", () => first.Room.Host.Value = new User { Username = @"DrabWeb", Id = 6946022, Country = new Country { FlagName = @"CA" } });
+            AddStep(@"change status", () => first.Room.Status.Value = new RoomStatusPlaying());
+            AddStep(@"change type", () => first.Room.Type.Value = new GameTypeVersus());
+            AddStep(@"change beatmap", () => first.Room.Beatmap.Value = null);
+            AddStep(@"change participants", () => first.Room.Participants.Value = new[]
             {
-                first.Room.Status.Value = new RoomStatusPlaying();
+                new User { GlobalRank = 1254 },
+                new User { GlobalRank = 123189 },
             });
+        }
 
-            AddStep(@"change name", () =>
-            {
-                first.Room.Name.Value = @"I Changed Name";
-            });
-
-            AddStep(@"change host", () =>
-            {
-                first.Room.Host.Value = new User { Username = @"DrabWeb", Id = 6946022, Country = new Country { FlagName = @"CA" } };
-            });
-
-            AddStep(@"change beatmap", () =>
-            {
-                first.Room.Beatmap.Value = null;
-            });
-
-            AddStep(@"change state", () =>
-            {
-                first.Room.Status.Value = new RoomStatusOpen();
-            });
+        [BackgroundDependencyLoader]
+        private void load(RulesetStore rulesets)
+        {
+            this.rulesets = rulesets;
         }
     }
 }

osu.Desktop.VisualTests/Tests/TestCaseDrawings.cs

@@ -12,10 +12,8 @@ namespace osu.Desktop.VisualTests.Tests
     {
         public override string Description => "Tournament drawings";
 
-        public override void Reset()
+        public TestCaseDrawings()
         {
-            base.Reset();
-
             Add(new Drawings
             {
                 TeamList = new TestTeamList(),

osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs

@@ -8,7 +8,6 @@ using osu.Framework.MathUtils;
 using osu.Framework.Testing;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
-using osu.Game.Database;
 using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Objects;
@@ -19,24 +18,25 @@ using System.Collections.Generic;
 using osu.Desktop.VisualTests.Beatmaps;
 using osu.Framework.Allocation;
 using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets;
 
 namespace osu.Desktop.VisualTests.Tests
 {
     internal class TestCaseGamefield : TestCase
     {
-        private RulesetDatabase rulesets;
+        private RulesetStore rulesets;
 
         public override string Description => @"Showing hitobjects and what not.";
 
         [BackgroundDependencyLoader]
-        private void load(RulesetDatabase rulesets)
+        private void load(RulesetStore rulesets)
         {
             this.rulesets = rulesets;
         }
 
-        public override void Reset()
+        protected override void LoadComplete()
         {
-            base.Reset();
+            base.LoadComplete();
 
             List<HitObject> objects = new List<HitObject>();
 
@@ -76,7 +76,7 @@ namespace osu.Desktop.VisualTests.Tests
                 ControlPointInfo = controlPointInfo
             });
 
-            Add(new Drawable[]
+            AddRange(new Drawable[]
             {
                 new Container
                 {

osu.Desktop.VisualTests/Tests/TestCaseGraph.cs

@@ -13,11 +13,9 @@ namespace osu.Desktop.VisualTests.Tests
     {
         public override string Description => "graph";
 
-        private BarGraph graph;
-
-        public override void Reset()
+        public TestCaseGraph()
         {
-            base.Reset();
+            BarGraph graph;
 
             Children = new[]
             {

osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs

@@ -29,15 +29,58 @@ namespace osu.Desktop.VisualTests.Tests
             var rateAdjustClock = new StopwatchClock(true);
             framedClock = new FramedClock(rateAdjustClock);
             playbackSpeed.ValueChanged += delegate { rateAdjustClock.Rate = playbackSpeed.Value; };
+
+            playbackSpeed.TriggerChange();
+
+            AddStep(@"circles", () => loadHitobjects(HitObjectType.Circle));
+            AddStep(@"slider", () => loadHitobjects(HitObjectType.Slider));
+            AddStep(@"spinner", () => loadHitobjects(HitObjectType.Spinner));
+
+            AddToggleStep(@"auto", state => { auto = state; loadHitobjects(mode); });
+
+            BasicSliderBar<double> sliderBar;
+            Add(new Container
+            {
+                Anchor = Anchor.TopRight,
+                Origin = Anchor.TopRight,
+                AutoSizeAxes = Axes.Both,
+                Children = new Drawable[]
+                {
+                    new SpriteText { Text = "Playback Speed" },
+                    sliderBar = new BasicSliderBar<double>
+                    {
+                        Width = 150,
+                        Height = 10,
+                        SelectionColor = Color4.Orange,
+                    }
+                }
+            });
+
+            sliderBar.Current.BindTo(playbackSpeed);
+
+            framedClock.ProcessFrame();
+
+            var clockAdjustContainer = new Container
+            {
+                RelativeSizeAxes = Axes.Both,
+                Clock = framedClock,
+                Children = new[]
+                {
+                    playfieldContainer = new Container { RelativeSizeAxes = Axes.Both },
+                    approachContainer = new Container { RelativeSizeAxes = Axes.Both }
+                }
+            };
+
+            Add(clockAdjustContainer);
         }
 
         private HitObjectType mode = HitObjectType.Slider;
 
         private readonly BindableNumber<double> playbackSpeed = new BindableDouble(0.5) { MinValue = 0, MaxValue = 1 };
-        private Container playfieldContainer;
-        private Container approachContainer;
+        private readonly Container playfieldContainer;
+        private readonly Container approachContainer;
 
-        private void load(HitObjectType mode)
+        private void loadHitobjects(HitObjectType mode)
         {
             this.mode = mode;
 
@@ -83,54 +126,6 @@ namespace osu.Desktop.VisualTests.Tests
             }
         }
 
-        public override void Reset()
-        {
-            base.Reset();
-
-            playbackSpeed.TriggerChange();
-
-            AddStep(@"circles", () => load(HitObjectType.Circle));
-            AddStep(@"slider", () => load(HitObjectType.Slider));
-            AddStep(@"spinner", () => load(HitObjectType.Spinner));
-
-            AddToggleStep(@"auto", state => { auto = state; load(mode); });
-
-            BasicSliderBar<double> sliderBar;
-            Add(new Container
-            {
-                Anchor = Anchor.TopRight,
-                Origin = Anchor.TopRight,
-                AutoSizeAxes = Axes.Both,
-                Children = new Drawable[]
-                {
-                    new SpriteText { Text = "Playback Speed" },
-                    sliderBar = new BasicSliderBar<double>
-                    {
-                        Width = 150,
-                        Height = 10,
-                        SelectionColor = Color4.Orange,
-                    }
-                }
-            });
-
-            sliderBar.Current.BindTo(playbackSpeed);
-
-            framedClock.ProcessFrame();
-
-            var clockAdjustContainer = new Container
-            {
-                RelativeSizeAxes = Axes.Both,
-                Clock = framedClock,
-                Children = new[]
-                {
-                    playfieldContainer = new Container { RelativeSizeAxes = Axes.Both },
-                    approachContainer = new Container { RelativeSizeAxes = Axes.Both }
-                }
-            };
-
-            Add(clockAdjustContainer);
-        }
-
         private int depth;
 
         private void add(DrawableOsuHitObject h)

osu.Desktop.VisualTests/Tests/TestCaseKeyCounter.cs

@@ -10,6 +10,7 @@ using osu.Framework.Graphics.Containers;
 using OpenTK;
 using OpenTK.Graphics;
 using osu.Framework.MathUtils;
+using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Screens.Play;
 
@@ -19,10 +20,8 @@ namespace osu.Desktop.VisualTests.Tests
     {
         public override string Description => @"Tests key counter";
 
-        public override void Reset()
+        public TestCaseKeyCounter()
         {
-            base.Reset();
-
             KeyCounterCollection kc = new KeyCounterCollection
             {
                 Origin = Anchor.Centre,
@@ -97,7 +96,7 @@ namespace osu.Desktop.VisualTests.Tests
             {
                 SelectionBox.ScaleTo(
                     new Vector2(value, 1),
-                    300, EasingTypes.OutQuint);
+                    300, Easing.OutQuint);
             }
         }
     }

osu.Desktop.VisualTests/Tests/TestCaseLeaderboard.cs

@@ -16,7 +16,7 @@ namespace osu.Desktop.VisualTests.Tests
     {
         public override string Description => @"From song select";
 
-        private Leaderboard leaderboard;
+        private readonly Leaderboard leaderboard;
 
         private void newScores()
         {
@@ -207,10 +207,8 @@ namespace osu.Desktop.VisualTests.Tests
             leaderboard.Scores = scores;
         }
 
-        public override void Reset()
+        public TestCaseLeaderboard()
         {
-            base.Reset();
-
             Add(leaderboard = new Leaderboard
             {
                 Origin = Anchor.Centre,

osu.Desktop.VisualTests/Tests/TestCaseManiaHitObjects.cs

@@ -13,10 +13,8 @@ namespace osu.Desktop.VisualTests.Tests
 {
     internal class TestCaseManiaHitObjects : TestCase
     {
-        public override void Reset()
+        public TestCaseManiaHitObjects()
         {
-            base.Reset();
-
             Add(new FillFlowContainer
             {
                 Anchor = Anchor.Centre,

osu.Desktop.VisualTests/Tests/TestCaseManiaPlayfield.cs

@@ -6,14 +6,16 @@ using osu.Framework.Testing;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Mania.UI;
 using System;
-using System.Collections.Generic;
 using OpenTK;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Mania.Objects;
-using osu.Game.Rulesets.Mania.Timing;
 using osu.Framework.Configuration;
 using OpenTK.Input;
 using osu.Framework.Timing;
+using osu.Framework.Extensions.IEnumerableExtensions;
+using System.Linq;
+using osu.Game.Rulesets.Mania.Timing;
+using osu.Game.Rulesets.Timing;
 
 namespace osu.Desktop.VisualTests.Tests
 {
@@ -23,14 +25,12 @@ namespace osu.Desktop.VisualTests.Tests
 
         protected override double TimePerAction => 200;
 
-        public override void Reset()
+        public TestCaseManiaPlayfield()
         {
-            base.Reset();
-
             Action<int, SpecialColumnPosition> createPlayfield = (cols, pos) =>
             {
                 Clear();
-                Add(new ManiaPlayfield(cols, new List<TimingChange>())
+                Add(new ManiaPlayfield(cols)
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
@@ -39,37 +39,22 @@ namespace osu.Desktop.VisualTests.Tests
                 });
             };
 
-            Action<int, SpecialColumnPosition> createPlayfieldWithNotes = (cols, pos) =>
+            const double start_time = 500;
+            const double duration = 500;
+
+            Func<double, bool, SpeedAdjustmentContainer> createTimingChange = (time, gravity) => new ManiaSpeedAdjustmentContainer(new MultiplierControlPoint(time)
+            {
+                TimingPoint = { BeatLength = 1000 }
+            }, gravity ? ScrollingAlgorithm.Gravity : ScrollingAlgorithm.Basic);
+
+            Action<bool> createPlayfieldWithNotes = gravity =>
             {
                 Clear();
 
-                ManiaPlayfield playField;
-                Add(playField = new ManiaPlayfield(cols, new List<TimingChange> { new TimingChange { BeatLength = 200 } })
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    SpecialColumnPosition = pos,
-                    Scale = new Vector2(1, -1)
-                });
-
-                for (int i = 0; i < cols; i++)
-                {
-                    playField.Add(new DrawableNote(new Note
-                    {
-                        StartTime = Time.Current + 1000,
-                        Column = i
-                    }));
-                }
-            };
-
-            Action createPlayfieldWithNotesAcceptingInput = () =>
-            {
-                Clear();
-
-                var rateAdjustClock = new StopwatchClock(true) { Rate = 0.5 };
+                var rateAdjustClock = new StopwatchClock(true) { Rate = 1 };
 
                 ManiaPlayfield playField;
-                Add(playField = new ManiaPlayfield(4, new List<TimingChange> { new TimingChange { BeatLength = 200 } })
+                Add(playField = new ManiaPlayfield(4)
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
@@ -77,14 +62,23 @@ namespace osu.Desktop.VisualTests.Tests
                     Clock = new FramedClock(rateAdjustClock)
                 });
 
-                for (int t = 1000; t <= 2000; t += 100)
+                if (!gravity)
+                    playField.Columns.ForEach(c => c.Add(createTimingChange(0, false)));
+
+                for (double t = start_time; t <= start_time + duration; t += 100)
                 {
+                    if (gravity)
+                        playField.Columns.ElementAt(0).Add(createTimingChange(t, true));
+
                     playField.Add(new DrawableNote(new Note
                     {
                         StartTime = t,
                         Column = 0
                     }, new Bindable<Key>(Key.D)));
 
+                    if (gravity)
+                        playField.Columns.ElementAt(3).Add(createTimingChange(t, true));
+
                     playField.Add(new DrawableNote(new Note
                     {
                         StartTime = t,
@@ -92,17 +86,23 @@ namespace osu.Desktop.VisualTests.Tests
                     }, new Bindable<Key>(Key.K)));
                 }
 
-                playField.Add(new DrawableHoldNote(new HoldNote
-                {
-                    StartTime = 1000,
-                    Duration = 1000,
-                    Column = 1
-                }, new Bindable<Key>(Key.F)));
+                if (gravity)
+                    playField.Columns.ElementAt(1).Add(createTimingChange(start_time, true));
 
                 playField.Add(new DrawableHoldNote(new HoldNote
                 {
-                    StartTime = 1000,
-                    Duration = 1000,
+                    StartTime = start_time,
+                    Duration = duration,
+                    Column = 1
+                }, new Bindable<Key>(Key.F)));
+
+                if (gravity)
+                    playField.Columns.ElementAt(2).Add(createTimingChange(start_time, true));
+
+                playField.Add(new DrawableHoldNote(new HoldNote
+                {
+                    StartTime = start_time,
+                    Duration = duration,
                     Column = 2
                 }, new Bindable<Key>(Key.J)));
             };
@@ -116,16 +116,11 @@ namespace osu.Desktop.VisualTests.Tests
             AddStep("Left special style", () => createPlayfield(8, SpecialColumnPosition.Left));
             AddStep("Right special style", () => createPlayfield(8, SpecialColumnPosition.Right));
 
-            AddStep("Normal special style", () => createPlayfield(4, SpecialColumnPosition.Normal));
+            AddStep("Notes with input", () => createPlayfieldWithNotes(false));
+            AddWaitStep((int)Math.Ceiling((start_time + duration) / TimePerAction));
 
-            AddStep("Notes", () => createPlayfieldWithNotes(4, SpecialColumnPosition.Normal));
-            AddWaitStep(10);
-            AddStep("Left special style", () => createPlayfieldWithNotes(4, SpecialColumnPosition.Left));
-            AddWaitStep(10);
-            AddStep("Right special style", () => createPlayfieldWithNotes(4, SpecialColumnPosition.Right));
-            AddWaitStep(10);
-
-            AddStep("Notes with input", () => createPlayfieldWithNotesAcceptingInput());
+            AddStep("Notes with gravity", () => createPlayfieldWithNotes(true));
+            AddWaitStep((int)Math.Ceiling((start_time + duration) / TimePerAction));
         }
 
         private void triggerKeyDown(Column column)

osu.Desktop.VisualTests/Tests/TestCaseMedalOverlay.cs

@@ -0,0 +1,27 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Testing;
+using osu.Game.Overlays;
+using osu.Game.Users;
+
+namespace osu.Desktop.VisualTests.Tests
+{
+    internal class TestCaseMedalOverlay : TestCase
+    {
+        public override string Description => @"medal get!";
+
+        public TestCaseMedalOverlay()
+        {
+            AddStep(@"display", () =>
+            {
+                LoadComponentAsync(new MedalOverlay(new Medal
+                {
+                    Name = @"Animations",
+                    InternalName = @"all-intro-doubletime",
+                    Description = @"More complex than you think.",
+                }), Add);
+            });
+        }
+    }
+}

osu.Desktop.VisualTests/Tests/TestCaseMenuButtonSystem.cs

@@ -3,9 +3,9 @@
 
 using osu.Framework.Testing;
 using osu.Framework.Graphics.Colour;
-using osu.Framework.Graphics.Sprites;
 using osu.Game.Screens.Menu;
 using OpenTK.Graphics;
+using osu.Framework.Graphics.Shapes;
 
 namespace osu.Desktop.VisualTests.Tests
 {
@@ -13,13 +13,11 @@ namespace osu.Desktop.VisualTests.Tests
     {
         public override string Description => @"Main menu button system";
 
-        public override void Reset()
+        public TestCaseMenuButtonSystem()
         {
-            base.Reset();
-
             Add(new Box
             {
-                ColourInfo = ColourInfo.GradientVertical(Color4.Gray, Color4.WhiteSmoke),
+                Colour = ColourInfo.GradientVertical(Color4.Gray, Color4.WhiteSmoke),
                 RelativeSizeAxes = Framework.Graphics.Axes.Both,
             });
             Add(new ButtonSystem());

osu.Desktop.VisualTests/Tests/TestCaseMenuOverlays.cs

@@ -12,15 +12,12 @@ namespace osu.Desktop.VisualTests.Tests
     {
         public override string Description => @"Tests pause and fail overlays";
 
-        private PauseContainer.PauseOverlay pauseOverlay;
-        private FailOverlay failOverlay;
-        private int retryCount;
-
-        public override void Reset()
+        public TestCaseMenuOverlays()
         {
-            base.Reset();
+            FailOverlay failOverlay;
+            PauseContainer.PauseOverlay pauseOverlay;
 
-            retryCount = 0;
+            var retryCount = 0;
 
             Add(pauseOverlay = new PauseContainer.PauseOverlay
             {
@@ -34,14 +31,16 @@ namespace osu.Desktop.VisualTests.Tests
                 OnQuit = () => Logger.Log(@"Quit"),
             });
 
-            AddStep(@"Pause", delegate {
+            AddStep(@"Pause", delegate
+            {
                 if (failOverlay.State == Visibility.Visible)
                 {
                     failOverlay.Hide();
                 }
                 pauseOverlay.Show();
             });
-            AddStep("Fail", delegate {
+            AddStep("Fail", delegate
+            {
                 if (pauseOverlay.State == Visibility.Visible)
                 {
                     pauseOverlay.Hide();

osu.Desktop.VisualTests/Tests/TestCaseMods.cs

@@ -5,7 +5,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Overlays.Mods;
 using osu.Framework.Testing;
-using osu.Game.Database;
+using osu.Game.Rulesets;
 using osu.Game.Screens.Play.HUD;
 using OpenTK;
 
@@ -18,18 +18,18 @@ namespace osu.Desktop.VisualTests.Tests
         private ModSelectOverlay modSelect;
         private ModDisplay modDisplay;
 
-        private RulesetDatabase rulesets;
+        private RulesetStore rulesets;
 
 
         [BackgroundDependencyLoader]
-        private void load(RulesetDatabase rulesets)
+        private void load(RulesetStore rulesets)
         {
             this.rulesets = rulesets;
         }
 
-        public override void Reset()
+        protected override void LoadComplete()
         {
-            base.Reset();
+            base.LoadComplete();
 
             Add(modSelect = new ModSelectOverlay
             {

osu.Desktop.VisualTests/Tests/TestCaseMusicController.cs

@@ -1,11 +1,15 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Framework.Testing;
+using osu.Framework.Allocation;
+using osu.Framework.Configuration;
 using osu.Framework.Graphics;
-using osu.Framework.Timing;
-using osu.Game.Overlays;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Testing;
+using osu.Framework.Timing;
+using osu.Game;
+using osu.Game.Beatmaps;
+using osu.Game.Overlays;
 
 namespace osu.Desktop.VisualTests.Tests
 {
@@ -13,18 +17,13 @@ namespace osu.Desktop.VisualTests.Tests
     {
         public override string Description => @"Tests music controller ui.";
 
-        private MusicController mc;
+        private readonly Bindable<WorkingBeatmap> beatmapBacking = new Bindable<WorkingBeatmap>();
 
         public TestCaseMusicController()
         {
             Clock = new FramedClock();
-        }
 
-        public override void Reset()
-        {
-            base.Reset();
-            Clock.ProcessFrame();
-            mc = new MusicController
+            var mc = new MusicController
             {
                 Origin = Anchor.Centre,
                 Anchor = Anchor.Centre
@@ -33,6 +32,13 @@ namespace osu.Desktop.VisualTests.Tests
 
             AddToggleStep(@"toggle visibility", state => mc.State = state ? Visibility.Visible : Visibility.Hidden);
             AddStep(@"show", () => mc.State = Visibility.Visible);
+            AddToggleStep(@"toggle beatmap lock", state => beatmapBacking.Disabled = state);
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuGameBase game)
+        {
+            beatmapBacking.BindTo(game.Beatmap);
         }
     }
 }

osu.Desktop.VisualTests/Tests/TestCaseNotificationOverlay.cs

@@ -12,19 +12,17 @@ using osu.Framework.Graphics.Containers;
 
 namespace osu.Desktop.VisualTests.Tests
 {
-    internal class TestCaseNotificationManager : TestCase
+    internal class TestCaseNotificationOverlay : TestCase
     {
         public override string Description => @"I handle notifications";
 
-        private NotificationManager manager;
+        private readonly NotificationOverlay manager;
 
-        public override void Reset()
+        public TestCaseNotificationOverlay()
         {
-            base.Reset();
-
             progressingNotifications.Clear();
 
-            Content.Add(manager = new NotificationManager
+            Content.Add(manager = new NotificationOverlay
             {
                 Anchor = Anchor.TopRight,
                 Origin = Anchor.TopRight,
@@ -58,10 +56,7 @@ namespace osu.Desktop.VisualTests.Tests
             }
 
             if (remaining > 0)
-            {
-                Delay(80);
-                Schedule(() => sendBarrage(remaining - 1));
-            }
+                Scheduler.AddDelayed(() => sendBarrage(remaining - 1), 80);
         }
 
         protected override void Update()

osu.Desktop.VisualTests/Tests/TestCaseOnScreenDisplay.cs

@@ -15,9 +15,9 @@ namespace osu.Desktop.VisualTests.Tests
 
         public override string Description => @"Make it easier to see setting changes";
 
-        public override void Reset()
+        protected override void LoadComplete()
         {
-            base.Reset();
+            base.LoadComplete();
 
             Add(new OnScreenDisplay());
 

osu.Desktop.VisualTests/Tests/TestCasePlaySongSelect.cs

@@ -5,7 +5,9 @@ using System.Collections.Generic;
 using osu.Desktop.VisualTests.Platform;
 using osu.Framework.Testing;
 using osu.Framework.MathUtils;
+using osu.Game.Beatmaps;
 using osu.Game.Database;
+using osu.Game.Rulesets;
 using osu.Game.Screens.Select;
 using osu.Game.Screens.Select.Filter;
 
@@ -13,32 +15,28 @@ namespace osu.Desktop.VisualTests.Tests
 {
     internal class TestCasePlaySongSelect : TestCase
     {
-        private BeatmapDatabase db;
-        private TestStorage storage;
-        private PlaySongSelect songSelect;
+        private readonly BeatmapManager manager;
 
         public override string Description => @"with fake data";
 
-        private RulesetDatabase rulesets;
+        private readonly RulesetStore rulesets;
 
-        public override void Reset()
+        public TestCasePlaySongSelect()
         {
-            base.Reset();
-            if (db == null)
+            PlaySongSelect songSelect;
+
+            if (manager == null)
             {
-                storage = new TestStorage(@"TestCasePlaySongSelect");
+                var storage = new TestStorage(@"TestCasePlaySongSelect");
 
                 var backingDatabase = storage.GetDatabase(@"client");
+                backingDatabase.CreateTable<StoreVersion>();
 
-                rulesets = new RulesetDatabase(storage, backingDatabase);
-                db = new BeatmapDatabase(storage, backingDatabase, rulesets);
-
-                var sets = new List<BeatmapSetInfo>();
+                rulesets = new RulesetStore(backingDatabase);
+                manager = new BeatmapManager(storage, null, backingDatabase, rulesets);
 
                 for (int i = 0; i < 100; i += 10)
-                    sets.Add(createTestBeatmapSet(i));
-
-                db.Import(sets);
+                    manager.Import(createTestBeatmapSet(i));
             }
 
             Add(songSelect = new PlaySongSelect());
@@ -49,21 +47,12 @@ namespace osu.Desktop.VisualTests.Tests
             AddStep(@"Sort by Difficulty", delegate { songSelect.FilterControl.Sort = SortMode.Difficulty; });
         }
 
-        //protected override void Dispose(bool isDisposing)
-        //{
-        //    if (oldDb != null)
-        //        db = null;
-
-        //    base.Dispose(isDisposing);
-        //}
-
         private BeatmapSetInfo createTestBeatmapSet(int i)
         {
             return new BeatmapSetInfo
             {
                 OnlineBeatmapSetID = 1234 + i,
                 Hash = "d8e8fca2dc0f896fd7cb4cb0031ba249",
-                Path = string.Empty,
                 Metadata = new BeatmapMetadata
                 {
                     OnlineBeatmapSetID = 1234 + i,

osu.Desktop.VisualTests/Tests/TestCasePlayer.cs

@@ -2,84 +2,72 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System.Collections.Generic;
-using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using OpenTK;
-using osu.Framework.Graphics.Sprites;
-using osu.Game.Database;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Screens.Play;
 using OpenTK.Graphics;
 using osu.Desktop.VisualTests.Beatmaps;
 using osu.Game.Rulesets.Osu.UI;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Rulesets;
 
 namespace osu.Desktop.VisualTests.Tests
 {
     internal class TestCasePlayer : TestCase
     {
         protected Player Player;
-        private BeatmapDatabase db;
-        private RulesetDatabase rulesets;
+        private RulesetStore rulesets;
 
         public override string Description => @"Showing everything to play the game.";
 
         [BackgroundDependencyLoader]
-        private void load(BeatmapDatabase db, RulesetDatabase rulesets)
+        private void load(RulesetStore rulesets)
         {
             this.rulesets = rulesets;
-            this.db = db;
         }
 
-        public override void Reset()
+        protected override void LoadComplete()
         {
-            base.Reset();
+            base.LoadComplete();
 
-            WorkingBeatmap beatmap = null;
+            var objects = new List<HitObject>();
 
-            var beatmapInfo = db.Query<BeatmapInfo>().FirstOrDefault(b => b.RulesetID == 0);
-            if (beatmapInfo != null)
-                beatmap = db.GetWorkingBeatmap(beatmapInfo);
-
-            if (beatmap?.Track == null)
+            int time = 1500;
+            for (int i = 0; i < 50; i++)
             {
-                var objects = new List<HitObject>();
-
-                int time = 1500;
-                for (int i = 0; i < 50; i++)
+                objects.Add(new HitCircle
                 {
-                    objects.Add(new HitCircle
-                    {
-                        StartTime = time,
-                        Position = new Vector2(i % 4 == 0 || i % 4 == 2 ? 0 : OsuPlayfield.BASE_SIZE.X,
-                        i % 4 < 2 ? 0 : OsuPlayfield.BASE_SIZE.Y),
-                        NewCombo = i % 4 == 0
-                    });
+                    StartTime = time,
+                    Position = new Vector2(i % 4 == 0 || i % 4 == 2 ? 0 : OsuPlayfield.BASE_SIZE.X,
+                    i % 4 < 2 ? 0 : OsuPlayfield.BASE_SIZE.Y),
+                    NewCombo = i % 4 == 0
+                });
 
-                    time += 500;
-                }
-
-                Beatmap b = new Beatmap
-                {
-                    HitObjects = objects,
-                    BeatmapInfo = new BeatmapInfo
-                    {
-                        Difficulty = new BeatmapDifficulty(),
-                        Ruleset = rulesets.Query<RulesetInfo>().First(),
-                        Metadata = new BeatmapMetadata
-                        {
-                            Artist = @"Unknown",
-                            Title = @"Sample Beatmap",
-                            Author = @"peppy",
-                        }
-                    }
-                };
-
-                beatmap = new TestWorkingBeatmap(b);
+                time += 500;
             }
 
+            Beatmap b = new Beatmap
+            {
+                HitObjects = objects,
+                BeatmapInfo = new BeatmapInfo
+                {
+                    Difficulty = new BeatmapDifficulty(),
+                    Ruleset = rulesets.Query<RulesetInfo>().First(),
+                    Metadata = new BeatmapMetadata
+                    {
+                        Artist = @"Unknown",
+                        Title = @"Sample Beatmap",
+                        Author = @"peppy",
+                    }
+                }
+            };
+
+            WorkingBeatmap beatmap = new TestWorkingBeatmap(b);
+
             Add(new Box
             {
                 RelativeSizeAxes = Framework.Graphics.Axes.Both,
@@ -93,7 +81,7 @@ namespace osu.Desktop.VisualTests.Tests
         {
             return new Player
             {
-                Beatmap = beatmap
+                InitialBeatmap = beatmap
             };
         }
     }

osu.Desktop.VisualTests/Tests/TestCaseReplaySettingsOverlay.cs

@@ -13,13 +13,11 @@ namespace osu.Desktop.VisualTests.Tests
     {
         public override string Description => @"Settings visible in replay/auto";
 
-        private ExampleContainer container;
-
-        public override void Reset()
+        public TestCaseReplaySettingsOverlay()
         {
-            base.Reset();
+            ExampleContainer container;
 
-            Add(new ReplaySettingsOverlay()
+            Add(new ReplaySettingsOverlay
             {
                 Anchor = Anchor.TopRight,
                 Origin = Anchor.TopRight,

osu.Desktop.VisualTests/Tests/TestCaseResults.cs

@@ -3,11 +3,9 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
-using osu.Game.Database;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Ranking;
 using osu.Game.Users;
@@ -16,31 +14,29 @@ namespace osu.Desktop.VisualTests.Tests
 {
     internal class TestCaseResults : TestCase
     {
-        private BeatmapDatabase db;
+        private BeatmapManager beatmaps;
 
         public override string Description => @"Results after playing.";
 
         [BackgroundDependencyLoader]
-        private void load(BeatmapDatabase db)
+        private void load(BeatmapManager beatmaps)
         {
-            this.db = db;
+            this.beatmaps = beatmaps;
         }
 
         private WorkingBeatmap beatmap;
 
-        public override void Reset()
+        protected override void LoadComplete()
         {
-            base.Reset();
+            base.LoadComplete();
 
             if (beatmap == null)
             {
-                var beatmapInfo = db.Query<BeatmapInfo>().FirstOrDefault(b => b.RulesetID == 0);
+                var beatmapInfo = beatmaps.QueryBeatmap(b => b.RulesetID == 0);
                 if (beatmapInfo != null)
-                    beatmap = db.GetWorkingBeatmap(beatmapInfo);
+                    beatmap = beatmaps.GetWorkingBeatmap(beatmapInfo);
             }
 
-            base.Reset();
-
             Add(new Results(new Score
             {
                 TotalScore = 2845370,
@@ -48,7 +44,7 @@ namespace osu.Desktop.VisualTests.Tests
                 MaxCombo = 123,
                 Rank = ScoreRank.A,
                 Date = DateTimeOffset.Now,
-                Statistics = new Dictionary<string, dynamic>()
+                Statistics = new Dictionary<string, dynamic>
                 {
                     { "300", 50 },
                     { "100", 20 },
@@ -61,7 +57,7 @@ namespace osu.Desktop.VisualTests.Tests
                 }
             })
             {
-                Beatmap = beatmap
+                InitialBeatmap = beatmap
             });
         }
     }

osu.Desktop.VisualTests/Tests/TestCaseRoomInspector.cs

@@ -0,0 +1,144 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Testing;
+using osu.Framework.Graphics;
+using osu.Game.Screens.Multiplayer;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Users;
+using osu.Framework.Allocation;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets;
+
+namespace osu.Desktop.VisualTests.Tests
+{
+    internal class TestCaseRoomInspector : TestCase
+    {
+        public override string Description => @"from the multiplayer lobby";
+
+        private RulesetStore rulesets;
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            var room = new Room
+            {
+                Name = { Value = @"My Awesome Room" },
+                Host = { Value = new User { Username = @"flyte", Id = 3103765, Country = new Country { FlagName = @"JP" } } },
+                Status = { Value = new RoomStatusOpen() },
+                Type = { Value = new GameTypeTeamVersus() },
+                Beatmap =
+                {
+                    Value = new BeatmapInfo
+                    {
+                        StarDifficulty = 3.7,
+                        Ruleset = rulesets.GetRuleset(3),
+                        Metadata = new BeatmapMetadata
+                        {
+                            Title = @"Platina",
+                            Artist = @"Maaya Sakamoto",
+                            Author = @"uwutm8",
+                        },
+                        BeatmapSet = new BeatmapSetInfo
+                        {
+                            OnlineInfo = new BeatmapSetOnlineInfo
+                            {
+                                Covers = new BeatmapSetOnlineCovers
+                                {
+                                    Cover = @"https://assets.ppy.sh/beatmaps/560573/covers/cover.jpg?1492722343",
+                                },
+                            },
+                        },
+                    }
+                },
+                MaxParticipants = { Value = 200 },
+                Participants =
+                {
+                    Value = new[]
+                    {
+                        new User { Username = @"flyte", Id = 3103765, GlobalRank = 1425 },
+                        new User { Username = @"Cookiezi", Id = 124493, GlobalRank = 5466 },
+                        new User { Username = @"Angelsim", Id = 1777162, GlobalRank = 2873 },
+                        new User { Username = @"Rafis", Id = 2558286, GlobalRank = 4687 },
+                        new User { Username = @"hvick225", Id = 50265, GlobalRank = 3258 },
+                        new User { Username = @"peppy", Id = 2, GlobalRank = 6251 }
+                    }
+                }
+            };
+
+            RoomInspector inspector;
+            Add(inspector = new RoomInspector
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Room = room,
+            });
+
+            AddStep(@"change title", () => room.Name.Value = @"A Better Room Than The Above");
+            AddStep(@"change host", () => room.Host.Value = new User { Username = @"DrabWeb", Id = 6946022, Country = new Country { FlagName = @"CA" } });
+            AddStep(@"change status", () => room.Status.Value = new RoomStatusPlaying());
+            AddStep(@"change type", () => room.Type.Value = new GameTypeTag());
+            AddStep(@"change beatmap", () => room.Beatmap.Value = null);
+            AddStep(@"change max participants", () => room.MaxParticipants.Value = null);
+            AddStep(@"change participants", () => room.Participants.Value = new[]
+            {
+                new User { Username = @"filsdelama", Id = 2831793, GlobalRank = 8542 },
+                new User { Username = @"_index", Id = 652457, GlobalRank = 15024 }
+            });
+
+            AddStep(@"change room", () =>
+            {
+                var newRoom = new Room
+                {
+                    Name = { Value = @"My New, Better Than Ever Room" },
+                    Host = { Value = new User { Username = @"Angelsim", Id = 1777162, Country = new Country { FlagName = @"KR" } } },
+                    Status = { Value = new RoomStatusOpen() },
+                    Type = { Value = new GameTypeTagTeam() },
+                    Beatmap =
+                    {
+                        Value = new BeatmapInfo
+                        {
+                            StarDifficulty = 7.07,
+                            Ruleset = rulesets.GetRuleset(0),
+                            Metadata = new BeatmapMetadata
+                            {
+                                Title = @"FREEDOM DIVE",
+                                Artist = @"xi",
+                                Author = @"Nakagawa-Kanon",
+                            },
+                            BeatmapSet = new BeatmapSetInfo
+                            {
+                                OnlineInfo = new BeatmapSetOnlineInfo
+                                {
+                                    Covers = new BeatmapSetOnlineCovers
+                                    {
+                                        Cover = @"https://assets.ppy.sh/beatmaps/39804/covers/cover.jpg?1456506845",
+                                    },
+                                },
+                            },
+                        },
+                    },
+                    MaxParticipants = { Value = 10 },
+                    Participants =
+                    {
+                        Value = new[]
+                        {
+                            new User { Username = @"Angelsim", Id = 1777162, GlobalRank = 4 },
+                            new User { Username = @"HappyStick", Id = 256802, GlobalRank = 752 },
+                            new User { Username = @"-Konpaku-", Id = 2258797, GlobalRank = 571 }
+                        }
+                    }
+                };
+
+                inspector.Room = newRoom;
+            });
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(RulesetStore rulesets)
+        {
+            this.rulesets = rulesets;
+        }
+    }
+}

osu.Desktop.VisualTests/Tests/TestCaseScoreCounter.cs

@@ -15,10 +15,8 @@ namespace osu.Desktop.VisualTests.Tests
     {
         public override string Description => @"Tests multiple counters";
 
-        public override void Reset()
+        public TestCaseScoreCounter()
         {
-            base.Reset();
-
             int numerator = 0, denominator = 0;
 
             ScoreCounter score = new ScoreCounter(7)
@@ -52,7 +50,7 @@ namespace osu.Desktop.VisualTests.Tests
                 Origin = Anchor.BottomLeft,
                 Anchor = Anchor.BottomLeft,
                 Position = new Vector2(20, -160),
-                Count = 5,
+                CountStars = 5,
             };
             Add(stars);
 
@@ -61,7 +59,7 @@ namespace osu.Desktop.VisualTests.Tests
                 Origin = Anchor.BottomLeft,
                 Anchor = Anchor.BottomLeft,
                 Position = new Vector2(20, -190),
-                Text = stars.Count.ToString("0.00"),
+                Text = stars.CountStars.ToString("0.00"),
             };
             Add(starsLabel);
 
@@ -71,8 +69,8 @@ namespace osu.Desktop.VisualTests.Tests
                 comboCounter.Current.Value = 0;
                 numerator = denominator = 0;
                 accuracyCounter.SetFraction(0, 0);
-                stars.Count = 0;
-                starsLabel.Text = stars.Count.ToString("0.00");
+                stars.CountStars = 0;
+                starsLabel.Text = stars.CountStars.ToString("0.00");
             });
 
             AddStep(@"Hit! :D", delegate
@@ -93,8 +91,8 @@ namespace osu.Desktop.VisualTests.Tests
 
             AddStep(@"Alter stars", delegate
             {
-                stars.Count = RNG.NextSingle() * (stars.StarCount + 1);
-                starsLabel.Text = stars.Count.ToString("0.00");
+                stars.CountStars = RNG.NextSingle() * (stars.StarCount + 1);
+                starsLabel.Text = stars.CountStars.ToString("0.00");
             });
 
             AddStep(@"Stop counters", delegate

osu.Desktop.VisualTests/Tests/TestCaseScrollingHitObjects.cs

@@ -0,0 +1,210 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using OpenTK;
+using OpenTK.Graphics;
+using osu.Framework.Configuration;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Testing;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Timing;
+
+namespace osu.Desktop.VisualTests.Tests
+{
+    public class TestCaseScrollingHitObjects : TestCase
+    {
+        public override string Description => "SpeedAdjustmentContainer/DrawableTimingSection";
+
+        private readonly BindableDouble timeRangeBindable;
+        private readonly OsuSpriteText bottomLabel;
+        private readonly SpriteText topTime;
+        private readonly SpriteText bottomTime;
+
+        public TestCaseScrollingHitObjects()
+        {
+            OsuSpriteText timeRangeText;
+            SpeedAdjustmentCollection adjustmentCollection;
+
+            timeRangeBindable = new BindableDouble(2000)
+            {
+                MinValue = 200,
+                MaxValue = 4000,
+            };
+
+            SliderBar<double> timeRange;
+            Add(timeRange = new BasicSliderBar<double>
+            {
+                Size = new Vector2(200, 20),
+                SelectionColor = Color4.Pink,
+                KeyboardStep = 100
+            });
+
+            Add(timeRangeText = new OsuSpriteText
+            {
+                X = 210,
+                TextSize = 16,
+            });
+
+            timeRange.Current.BindTo(timeRangeBindable);
+            timeRangeBindable.ValueChanged += v => timeRangeText.Text = $"Visible Range: {v:#,#.#}";
+            timeRangeBindable.ValueChanged += v => bottomLabel.Text = $"t minus {v:#,#}";
+
+            AddRange(new Drawable[]
+            {
+                new Container
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Size = new Vector2(100, 500),
+                    Children = new Drawable[]
+                    {
+                        new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Alpha = 0.25f
+                        },
+                        adjustmentCollection = new SpeedAdjustmentCollection(Axes.Y)
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            VisibleTimeRange = timeRangeBindable,
+                            Masking = true,
+                        },
+                        new OsuSpriteText
+                        {
+                            Text = "t minus 0",
+                            Margin = new MarginPadding(2),
+                            TextSize = 14,
+                            Anchor = Anchor.TopRight,
+                        },
+                        bottomLabel = new OsuSpriteText
+                        {
+                            Text = "t minus x",
+                            Margin = new MarginPadding(2),
+                            TextSize = 14,
+                            Anchor = Anchor.BottomRight,
+                            Origin = Anchor.BottomLeft,
+                        },
+                        topTime = new OsuSpriteText
+                        {
+                            Margin = new MarginPadding(2),
+                            TextSize = 14,
+                            Anchor = Anchor.TopLeft,
+                            Origin = Anchor.TopRight,
+                        },
+                        bottomTime = new OsuSpriteText
+                        {
+                            Margin = new MarginPadding(2),
+                            TextSize = 14,
+                            Anchor = Anchor.BottomLeft,
+                            Origin = Anchor.BottomRight,
+                        },
+                    }
+                }
+            });
+
+            timeRangeBindable.TriggerChange();
+
+            adjustmentCollection.Add(new TestSpeedAdjustmentContainer(new MultiplierControlPoint()));
+
+            AddStep("Add hit object", () => adjustmentCollection.Add(new TestDrawableHitObject(new HitObject { StartTime = Time.Current + 2000 })));
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            topTime.Text = Time.Current.ToString("#,#");
+            bottomTime.Text = (Time.Current + timeRangeBindable.Value).ToString("#,#");
+        }
+
+        private class TestSpeedAdjustmentContainer : SpeedAdjustmentContainer
+        {
+            public override bool RemoveWhenNotAlive => false;
+
+            public TestSpeedAdjustmentContainer(MultiplierControlPoint controlPoint)
+                : base(controlPoint)
+            {
+            }
+
+            protected override DrawableTimingSection CreateTimingSection() => new TestDrawableTimingSection(ControlPoint);
+
+            private class TestDrawableTimingSection : DrawableTimingSection
+            {
+                private readonly MultiplierControlPoint controlPoint;
+
+                public TestDrawableTimingSection(MultiplierControlPoint controlPoint)
+                {
+                    this.controlPoint = controlPoint;
+                }
+
+                protected override void Update()
+                {
+                    base.Update();
+
+                    Y = (float)(controlPoint.StartTime - Time.Current);
+                }
+            }
+        }
+
+        private class TestDrawableHitObject : DrawableHitObject, IScrollingHitObject
+        {
+            private readonly Box background;
+            private const float height = 14;
+
+            public BindableDouble LifetimeOffset { get; } = new BindableDouble();
+
+            public TestDrawableHitObject(HitObject hitObject)
+                : base(hitObject)
+            {
+                AutoSizeAxes = Axes.Y;
+                RelativeSizeAxes = Axes.X;
+                RelativePositionAxes = Axes.Y;
+
+                Y = (float)hitObject.StartTime;
+
+                Children = new Drawable[]
+                {
+                    background = new Box
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        Height = height,
+                    },
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        Colour = Color4.Cyan,
+                        Height = 1,
+                    },
+                    new OsuSpriteText
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Colour = Color4.Black,
+                        TextSize = height,
+                        Font = @"Exo2.0-BoldItalic",
+                        Text = $"{hitObject.StartTime:#,#}"
+                    }
+                };
+            }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+                this.FadeInFromZero(250, Easing.OutQuint);
+            }
+
+            protected override void Update()
+            {
+                base.Update();
+                if (Time.Current >= HitObject.StartTime)
+                    background.Colour = Color4.Red;
+            }
+        }
+    }
+}

osu.Desktop.VisualTests/Tests/TestCaseSettings.cs

@@ -10,13 +10,16 @@ namespace osu.Desktop.VisualTests.Tests
     {
         public override string Description => @"Tests the settings overlay";
 
-        private SettingsOverlay settings;
+        private readonly SettingsOverlay settings;
 
-        public override void Reset()
+        public TestCaseSettings()
         {
-            base.Reset();
-
             Children = new[] { settings = new SettingsOverlay() };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
             settings.ToggleVisibility();
         }
     }

osu.Desktop.VisualTests/Tests/TestCaseSkipButton.cs

@@ -10,9 +10,10 @@ namespace osu.Desktop.VisualTests.Tests
     {
         public override string Description => @"Skip skip skippediskip";
 
-        public override void Reset()
+        protected override void LoadComplete()
         {
-            base.Reset();
+            base.LoadComplete();
+
             Add(new SkipButton(Clock.CurrentTime + 5000));
         }
     }

osu.Desktop.VisualTests/Tests/TestCaseSocial.cs

@@ -11,10 +11,8 @@ namespace osu.Desktop.VisualTests.Tests
     {
         public override string Description => @"social browser overlay";
 
-        public override void Reset()
+        public TestCaseSocial()
         {
-            base.Reset();
-
             SocialOverlay s = new SocialOverlay
             {
                 Users = new[]

osu.Desktop.VisualTests/Tests/TestCaseSongProgress.cs

@@ -15,15 +15,13 @@ namespace osu.Desktop.VisualTests.Tests
     {
         public override string Description => @"With fake data";
 
-        private SongProgress progress;
-        private SongProgressGraph graph;
+        private readonly SongProgress progress;
+        private readonly SongProgressGraph graph;
 
-        private StopwatchClock clock;
+        private readonly StopwatchClock clock;
 
-        public override void Reset()
+        public TestCaseSongProgress()
         {
-            base.Reset();
-
             clock = new StopwatchClock(true);
 
             Add(progress = new SongProgress

osu.Desktop.VisualTests/Tests/TestCaseTabControl.cs

@@ -14,10 +14,8 @@ namespace osu.Desktop.VisualTests.Tests
     {
         public override string Description => @"Filter for song select";
 
-        public override void Reset()
+        public TestCaseTabControl()
         {
-            base.Reset();
-
             OsuSpriteText text;
             OsuTabControl<GroupMode> filter;
             Add(filter = new OsuTabControl<GroupMode>

osu.Desktop.VisualTests/Tests/TestCaseTaikoHitObjects.cs

@@ -16,10 +16,8 @@ namespace osu.Desktop.VisualTests.Tests
 
         private bool kiai;
 
-        public override void Reset()
+        public TestCaseTaikoHitObjects()
         {
-            base.Reset();
-
             AddToggleStep("Kiai", b =>
             {
                 kiai = !kiai;

osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs

@@ -26,13 +26,11 @@ namespace osu.Desktop.VisualTests.Tests
         protected override double TimePerAction => default_duration * 2;
 
         private readonly Random rng = new Random(1337);
-        private TaikoPlayfield playfield;
-        private Container playfieldContainer;
+        private readonly TaikoPlayfield playfield;
+        private readonly Container playfieldContainer;
 
-        public override void Reset()
+        public TestCaseTaikoPlayfield()
         {
-            base.Reset();
-
             AddStep("Hit!", addHitJudgement);
             AddStep("Miss :(", addMissJudgement);
             AddStep("DrumRoll", () => addDrumRoll(false));
@@ -69,6 +67,8 @@ namespace osu.Desktop.VisualTests.Tests
 
         private void changePlayfieldSize(int step)
         {
+            double delay = 0;
+
             // Add new hits
             switch (step)
             {
@@ -86,7 +86,7 @@ namespace osu.Desktop.VisualTests.Tests
                     break;
                 case 5:
                     addSwell(1000);
-                    playfieldContainer.Delay(scroll_time - 100);
+                    delay = scroll_time - 100;
                     break;
             }
 
@@ -94,10 +94,10 @@ namespace osu.Desktop.VisualTests.Tests
             switch (step)
             {
                 default:
-                    playfieldContainer.ResizeTo(new Vector2(1, rng.Next(25, 400)), 500);
+                    playfieldContainer.Delay(delay).ResizeTo(new Vector2(1, rng.Next(25, 400)), 500);
                     break;
                 case 6:
-                    playfieldContainer.ResizeTo(new Vector2(1, TaikoPlayfield.DEFAULT_PLAYFIELD_HEIGHT), 500);
+                    playfieldContainer.Delay(delay).ResizeTo(new Vector2(1, TaikoPlayfield.DEFAULT_PLAYFIELD_HEIGHT), 500);
                     break;
             }
         }

osu.Desktop.VisualTests/Tests/TestCaseTextAwesome.cs

@@ -16,10 +16,8 @@ namespace osu.Desktop.VisualTests.Tests
     {
         public override string Description => @"Tests display of icons";
 
-        public override void Reset()
+        public TestCaseTextAwesome()
         {
-            base.Reset();
-
             FillFlowContainer flow;
 
             Add(flow = new FillFlowContainer

osu.Desktop.VisualTests/Tests/TestCaseTwoLayerButton.cs

@@ -10,10 +10,8 @@ namespace osu.Desktop.VisualTests.Tests
     {
         public override string Description => @"Mostly back button";
 
-        public override void Reset()
+        public TestCaseTwoLayerButton()
         {
-            base.Reset();
-
             Add(new BackButton());
         }
     }

osu.Desktop.VisualTests/Tests/TestCaseUserPanel.cs

@@ -13,10 +13,8 @@ namespace osu.Desktop.VisualTests.Tests
     {
         public override string Description => @"Panels for displaying a user's status";
 
-        public override void Reset()
+        public TestCaseUserPanel()
         {
-            base.Reset();
-
             UserPanel flyte;
             UserPanel peppy;
             Add(new FillFlowContainer

osu.Desktop.VisualTests/Tests/TestCaseUserProfile.cs

@@ -0,0 +1,64 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using System.Linq;
+using osu.Framework.Testing;
+using osu.Game.Overlays;
+using osu.Game.Users;
+
+namespace osu.Desktop.VisualTests.Tests
+{
+    internal class TestCaseUserProfile : TestCase
+    {
+        public override string Description => "Tests user's profile page.";
+
+        public TestCaseUserProfile()
+        {
+            var profile = new UserProfileOverlay();
+            Add(profile);
+
+            AddStep("Show offline dummy", () => profile.ShowUser(new User
+            {
+                Username = @"Somebody",
+                Id = 1,
+                Country = new Country { FullName = @"Alien" },
+                CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c1.jpg",
+                JoinDate = DateTimeOffset.Now.AddDays(-1),
+                LastVisit = DateTimeOffset.Now,
+                Age = 1,
+                ProfileOrder = new[] { "me" },
+                CountryRank = 1,
+                Statistics = new UserStatistics
+                {
+                    Rank = 2148,
+                    PP = 4567.89m
+                },
+                AllRankHistories = new User.RankHistories
+                {
+                    Osu = new User.RankHistory
+                    {
+                        Mode = @"osu",
+                        Data = Enumerable.Range(2345,45).Concat(Enumerable.Range(2109,40)).ToArray()
+                    }
+                }
+            }, false));
+            AddStep("Show ppy", () => profile.ShowUser(new User
+            {
+                Username = @"peppy",
+                Id = 2,
+                Country = new Country { FullName = @"Australia", FlagName = @"AU" },
+                CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg"
+            }));
+            AddStep("Show flyte", () => profile.ShowUser(new User
+            {
+                Username = @"flyte",
+                Id = 3103765,
+                Country = new Country { FullName = @"Japan", FlagName = @"JP" },
+                CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c6.jpg"
+            }));
+            AddStep("Hide", profile.Hide);
+            AddStep("Show without reload", profile.Show);
+        }
+    }
+}

osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj

@@ -87,11 +87,13 @@
     <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>$(SolutionDir)\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="OpenTK, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.2.0.50727.1341\lib\net45\OpenTK.dll</HintPath>
+    <Reference Include="OpenTK, Version=3.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.3.0\lib\net45\OpenTK.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="SharpCompress, Version=0.15.2.0, Culture=neutral, PublicKeyToken=afb0a02973931d96, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\SharpCompress.0.15.2\lib\net45\SharpCompress.dll</HintPath>
+    <Reference Include="SharpCompress, Version=0.17.1.0, Culture=neutral, PublicKeyToken=afb0a02973931d96, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\SharpCompress.0.17.1\lib\net45\SharpCompress.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="SQLite.Net, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -185,8 +187,10 @@
   <ItemGroup>
     <Compile Include="AutomatedVisualTestGame.cs" />
     <Compile Include="Program.cs" />
+    <Compile Include="Tests\TestCaseBeatSyncedContainer.cs" />
     <Compile Include="Tests\TestCaseChatDisplay.cs" />
     <Compile Include="Tests\TestCaseBeatmapDetails.cs" />
+    <Compile Include="Tests\TestCaseContextMenu.cs" />
     <Compile Include="Tests\TestCaseDrawings.cs" />
     <Compile Include="Tests\TestCaseGamefield.cs" />
     <Compile Include="Tests\TestCaseGraph.cs" />
@@ -194,7 +198,7 @@
     <Compile Include="Tests\TestCaseManiaPlayfield.cs" />
     <Compile Include="Tests\TestCaseMenuOverlays.cs" />
     <Compile Include="Tests\TestCaseMusicController.cs" />
-    <Compile Include="Tests\TestCaseNotificationManager.cs" />
+    <Compile Include="Tests\TestCaseNotificationOverlay.cs" />
     <Compile Include="Tests\TestCaseOnScreenDisplay.cs" />
     <Compile Include="Tests\TestCaseReplaySettingsOverlay.cs" />
     <Compile Include="Tests\TestCasePlayer.cs" />
@@ -204,6 +208,7 @@
     <Compile Include="Tests\TestCaseReplay.cs" />
     <Compile Include="Tests\TestCaseResults.cs" />
     <Compile Include="Tests\TestCaseScoreCounter.cs" />
+    <Compile Include="Tests\TestCaseScrollingHitObjects.cs" />
     <Compile Include="Tests\TestCaseSkipButton.cs" />
     <Compile Include="Tests\TestCaseTabControl.cs" />
     <Compile Include="Tests\TestCaseTaikoHitObjects.cs" />
@@ -211,6 +216,7 @@
     <Compile Include="Tests\TestCaseTextAwesome.cs" />
     <Compile Include="Tests\TestCasePlaySongSelect.cs" />
     <Compile Include="Tests\TestCaseTwoLayerButton.cs" />
+    <Compile Include="Tests\TestCaseUserProfile.cs" />
     <Compile Include="VisualTestGame.cs" />
     <Compile Include="Platform\TestStorage.cs" />
     <Compile Include="Tests\TestCaseSettings.cs" />
@@ -226,6 +232,8 @@
     <Compile Include="Tests\TestCaseDirect.cs" />
     <Compile Include="Tests\TestCaseSocial.cs" />
     <Compile Include="Tests\TestCaseBreadcrumbs.cs" />
+    <Compile Include="Tests\TestCaseMedalOverlay.cs" />
+    <Compile Include="Tests\TestCaseRoomInspector.cs" />
   </ItemGroup>
   <ItemGroup />
   <ItemGroup />

osu.Desktop.VisualTests/packages.config

@@ -5,8 +5,8 @@ Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/maste
 -->
 <packages>
   <package id="Newtonsoft.Json" version="10.0.2" targetFramework="net45" />
-  <package id="ppy.OpenTK" version="2.0.50727.1341" targetFramework="net45" />
-  <package id="SharpCompress" version="0.15.2" targetFramework="net45" />
+  <package id="ppy.OpenTK" version="3.0" targetFramework="net45" />
+  <package id="SharpCompress" version="0.17.1" targetFramework="net45" />
   <package id="SQLite.Net.Core-PCL" version="3.1.1" targetFramework="net45" />
   <package id="SQLite.Net-PCL" version="3.1.1" targetFramework="net45" />
   <package id="SQLiteNetExtensions" version="1.3.0" targetFramework="net45" />

osu.Desktop/Beatmaps/IO/LegacyFilesystemReader.cs

@@ -1,43 +0,0 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using System.IO;
-using System.Linq;
-using osu.Game.Beatmaps.IO;
-
-namespace osu.Desktop.Beatmaps.IO
-{
-    /// <summary>
-    /// Reads an extracted legacy beatmap from disk.
-    /// </summary>
-    public class LegacyFilesystemReader : ArchiveReader
-    {
-        public static void Register() => AddReader<LegacyFilesystemReader>((storage, path) => Directory.Exists(path));
-
-        private readonly string basePath;
-
-        public LegacyFilesystemReader(string path)
-        {
-            basePath = path;
-
-            BeatmapFilenames = Directory.GetFiles(basePath, @"*.osu").Select(Path.GetFileName).ToArray();
-
-            if (BeatmapFilenames.Length == 0)
-                throw new FileNotFoundException(@"This directory contains no beatmaps");
-
-            StoryboardFilename = Directory.GetFiles(basePath, @"*.osb").Select(Path.GetFileName).FirstOrDefault();
-        }
-
-        public override Stream GetStream(string name)
-        {
-            return File.OpenRead(Path.Combine(basePath, name));
-        }
-
-        public override void Dispose()
-        {
-            // no-op
-        }
-
-        public override Stream GetUnderlyingStream() => null;
-    }
-}

osu.Desktop/OsuGameDesktop.cs

@@ -1,6 +1,7 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using System;
 using osu.Game;
 using System.Linq;
 using System.Windows.Forms;
@@ -11,6 +12,8 @@ using System.Reflection;
 using System.Drawing;
 using System.IO;
 using System.Threading.Tasks;
+using Microsoft.Win32;
+using osu.Framework.Graphics.Containers;
 using osu.Game.Screens.Menu;
 
 namespace osu.Desktop
@@ -22,18 +25,74 @@ namespace osu.Desktop
         public OsuGameDesktop(string[] args = null)
             : base(args)
         {
-            versionManager = new VersionManager { Depth = int.MinValue };
+            versionManager = new VersionManager
+            {
+                Depth = int.MinValue,
+                State = Visibility.Hidden
+            };
+        }
+
+        public override Storage GetStorageForStableInstall()
+        {
+            try
+            {
+                return new StableStorage();
+            }
+            catch
+            {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// A method of accessing an osu-stable install in a controlled fashion.
+        /// </summary>
+        private class StableStorage : DesktopStorage
+        {
+            protected override string LocateBasePath()
+            {
+                Func<string, bool> checkExists = p => Directory.Exists(Path.Combine(p, "Songs"));
+
+                string stableInstallPath;
+
+                try
+                {
+                    using (RegistryKey key = Registry.ClassesRoot.OpenSubKey("osu"))
+                        stableInstallPath = key?.OpenSubKey(@"shell\open\command")?.GetValue(String.Empty).ToString().Split('"')[1].Replace("osu!.exe", "");
+
+                    if (checkExists(stableInstallPath))
+                        return stableInstallPath;
+                }
+                catch
+                {
+                }
+
+                stableInstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), @"osu!");
+                if (checkExists(stableInstallPath))
+                    return stableInstallPath;
+
+                stableInstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".osu");
+                if (checkExists(stableInstallPath))
+                    return stableInstallPath;
+
+                return null;
+            }
+
+            public StableStorage()
+                : base(string.Empty)
+            {
+            }
         }
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
-            LoadComponentAsync(versionManager);
+            LoadComponentAsync(versionManager, Add);
             ScreenChanged += s =>
             {
-                if (!versionManager.IsAlive && s is Intro)
-                    Add(versionManager);
+                if (!versionManager.IsPresent && s is Intro)
+                    versionManager.State = Visibility.Visible;
             };
         }
 
@@ -45,7 +104,7 @@ namespace osu.Desktop
             {
                 desktopWindow.CursorState |= CursorState.Hidden;
 
-                desktopWindow.Icon = Icon.ExtractAssociatedIcon(Assembly.GetExecutingAssembly().Location);
+                desktopWindow.Icon = new Icon(Assembly.GetExecutingAssembly().GetManifestResourceStream(GetType(), "lazer.ico"));
                 desktopWindow.Title = Name;
 
                 desktopWindow.DragEnter += dragEnter;
@@ -60,11 +119,11 @@ namespace osu.Desktop
             var filePaths = dropData.Select(f => f.ToString()).ToArray();
 
             if (filePaths.All(f => Path.GetExtension(f) == @".osz"))
-                Task.Run(() => BeatmapDatabase.Import(filePaths));
+                Task.Run(() => BeatmapManager.Import(filePaths));
             else if (filePaths.All(f => Path.GetExtension(f) == @".osr"))
                 Task.Run(() =>
                 {
-                    var score = ScoreDatabase.ReadReplayFile(filePaths.First());
+                    var score = ScoreStore.ReadReplayFile(filePaths.First());
                     Schedule(() => LoadScore(score));
                 });
         }

osu.Desktop/Overlays/VersionManager.cs

@@ -10,6 +10,7 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
 using Squirrel;
+using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Graphics;
@@ -24,16 +25,16 @@ namespace osu.Desktop.Overlays
     public class VersionManager : OverlayContainer
     {
         private UpdateManager updateManager;
-        private NotificationManager notificationManager;
+        private NotificationOverlay notificationOverlay;
 
         protected override bool HideOnEscape => false;
 
         public override bool HandleInput => false;
 
         [BackgroundDependencyLoader]
-        private void load(NotificationManager notification, OsuColour colours, TextureStore textures, OsuGameBase game)
+        private void load(NotificationOverlay notification, OsuColour colours, TextureStore textures, OsuGameBase game)
         {
-            notificationManager = notification;
+            notificationOverlay = notification;
 
             AutoSizeAxes = Axes.Both;
             Anchor = Anchor.BottomCentre;
@@ -92,12 +93,6 @@ namespace osu.Desktop.Overlays
                 checkForUpdateAsync();
         }
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-            State = Visibility.Visible;
-        }
-
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
@@ -121,7 +116,7 @@ namespace osu.Desktop.Overlays
                 if (notification == null)
                 {
                     notification = new UpdateProgressNotification { State = ProgressNotificationState.Active };
-                    Schedule(() => notificationManager.Post(notification));
+                    Schedule(() => notificationOverlay.Post(notification));
                 }
 
                 Schedule(() =>
@@ -180,7 +175,7 @@ namespace osu.Desktop.Overlays
 
         protected override void PopIn()
         {
-            FadeIn(1000);
+            this.FadeIn(1000);
         }
 
         protected override void PopOut()
@@ -191,7 +186,7 @@ namespace osu.Desktop.Overlays
         {
             private OsuGame game;
 
-            protected override Notification CreateCompletionNotification() => new ProgressCompletionNotification()
+            protected override Notification CreateCompletionNotification() => new ProgressCompletionNotification
             {
                 Text = @"Update ready to install. Click to restart!",
                 Activated = () =>
@@ -207,12 +202,12 @@ namespace osu.Desktop.Overlays
             {
                 this.game = game;
 
-                IconContent.Add(new Drawable[]
+                IconContent.AddRange(new Drawable[]
                 {
                     new Box
                     {
                         RelativeSizeAxes = Axes.Both,
-                        ColourInfo = ColourInfo.GradientVertical(colours.YellowDark, colours.Yellow)
+                        Colour = ColourInfo.GradientVertical(colours.YellowDark, colours.Yellow)
                     },
                     new TextAwesome
                     {

osu.Desktop/Program.cs

@@ -3,7 +3,6 @@
 
 using System;
 using System.IO;
-using osu.Desktop.Beatmaps.IO;
 using osu.Framework.Desktop;
 using osu.Framework.Desktop.Platform;
 using osu.Game.IPC;
@@ -15,8 +14,6 @@ namespace osu.Desktop
         [STAThread]
         public static int Main(string[] args)
         {
-            LegacyFilesystemReader.Register();
-
             // Back up the cwd before DesktopGameHost changes it
             var cwd = Environment.CurrentDirectory;
 

osu.Desktop/osu.Desktop.csproj

@@ -121,18 +121,23 @@
     </Reference>
     <Reference Include="mscorlib" />
     <Reference Include="NuGet.Squirrel, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\squirrel.windows.1.5.2\lib\Net45\NuGet.Squirrel.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\squirrel.windows.1.7.5\lib\Net45\NuGet.Squirrel.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="OpenTK, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.2.0.50727.1341\lib\net45\OpenTK.dll</HintPath>
+    <Reference Include="OpenTK, Version=3.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.3.0\lib\net45\OpenTK.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="SharpCompress, Version=0.17.1.0, Culture=neutral, PublicKeyToken=afb0a02973931d96, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\SharpCompress.0.17.1\lib\net45\SharpCompress.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Splat, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>$(SolutionDir)\packages\Splat.2.0.0\lib\Net45\Splat.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Squirrel, Version=1.5.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\squirrel.windows.1.5.2\lib\Net45\Squirrel.dll</HintPath>
+    <Reference Include="Squirrel, Version=1.7.5.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\squirrel.windows.1.7.5\lib\Net45\Squirrel.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -223,11 +228,10 @@
     <Compile Include="OsuGameDesktop.cs" />
     <Compile Include="Overlays\VersionManager.cs" />
     <Compile Include="Program.cs" />
-    <Compile Include="Beatmaps\IO\LegacyFilesystemReader.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="lazer.ico" />
+    <EmbeddedResource Include="lazer.ico" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.

osu.Desktop/packages.config

@@ -7,7 +7,8 @@ Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/maste
   <package id="DeltaCompressionDotNet" version="1.1.0" targetFramework="net45" />
   <package id="Microsoft.Net.Http" version="2.2.29" targetFramework="net45" />
   <package id="Mono.Cecil" version="0.9.6.4" targetFramework="net45" />
-  <package id="ppy.OpenTK" version="2.0.50727.1341" targetFramework="net45" />
+  <package id="ppy.OpenTK" version="3.0" targetFramework="net45" />
+  <package id="SharpCompress" version="0.17.1" targetFramework="net45" />
   <package id="Splat" version="2.0.0" targetFramework="net45" />
-  <package id="squirrel.windows" version="1.5.2" targetFramework="net45" />
+  <package id="squirrel.windows" version="1.7.5" targetFramework="net45" />
 </packages>

osu.Game.Rulesets.Catch/Objects/Drawable/DrawableFruit.cs

@@ -5,18 +5,17 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
-using osu.Framework.Graphics.Transforms;
 using OpenTK;
 
 namespace osu.Game.Rulesets.Catch.Objects.Drawable
 {
     internal class DrawableFruit : Sprite
     {
-        private readonly CatchBaseHit h;
+        //private readonly CatchBaseHit h;
 
         public DrawableFruit(CatchBaseHit h)
         {
-            this.h = h;
+            //this.h = h;
 
             Origin = Anchor.Centre;
             Scale = new Vector2(0.1f);
@@ -29,10 +28,8 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
         {
             Texture = textures.Get(@"Menu/logo");
 
-            const double duration = 0;
-
-            Transforms.Add(new TransformPosition { StartTime = h.StartTime - 200, EndTime = h.StartTime, StartValue = new Vector2(h.Position, -0.1f), EndValue = new Vector2(h.Position, 0.9f) });
-            Transforms.Add(new TransformAlpha { StartTime = h.StartTime + duration + 200, EndTime = h.StartTime + duration + 400, StartValue = 1, EndValue = 0 });
+            //Transforms.Add(new TransformPosition { StartTime = h.StartTime - 200, EndTime = h.StartTime, StartValue = new Vector2(h.Position, -0.1f), EndValue = new Vector2(h.Position, 0.9f) });
+            //Transforms.Add(new TransformAlpha { StartTime = h.StartTime + duration + 200, EndTime = h.StartTime + duration + 400, StartValue = 1, EndValue = 0 });
             Expire(true);
         }
     }

osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs

@@ -2,7 +2,7 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Shapes;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.UI;
 using OpenTK;

osu.Game.Rulesets.Catch/osu.Game.Rulesets.Catch.csproj

@@ -33,8 +33,9 @@
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="OpenTK, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.2.0.50727.1341\lib\net45\OpenTK.dll</HintPath>
+    <Reference Include="OpenTK, Version=3.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.3.0\lib\net45\OpenTK.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

osu.Game.Rulesets.Catch/packages.config

@@ -5,5 +5,5 @@ Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 -->
 <packages>
-  <package id="ppy.OpenTK" version="2.0.50727.1341" targetFramework="net45" />
+  <package id="ppy.OpenTK" version="3.0" targetFramework="net45" />
 </packages>

osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs

@@ -10,7 +10,6 @@ using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Mania.Beatmaps.Patterns;
 using osu.Game.Rulesets.Mania.MathUtils;
-using osu.Game.Database;
 using osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy;
 using OpenTK;
 using osu.Game.Audio;

osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/PatternGenerator.cs

@@ -4,7 +4,6 @@
 using System;
 using System.Linq;
 using osu.Game.Beatmaps;
-using osu.Game.Database;
 using osu.Game.Rulesets.Mania.MathUtils;
 using osu.Game.Rulesets.Objects;
 using OpenTK;

osu.Game.Rulesets.Mania/Judgements/HitWindows.cs

@@ -1,7 +1,7 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Game.Database;
+using osu.Game.Beatmaps;
 
 namespace osu.Game.Rulesets.Mania.Judgements
 {

osu.Game.Rulesets.Mania/ManiaRuleset.cs

@@ -96,6 +96,7 @@ namespace osu.Game.Rulesets.Mania
                                 new ModCinema(),
                             },
                         },
+                        new ManiaModGravity()
                     };
 
                 default:

osu.Game.Rulesets.Mania/Mods/IGenerateSpeedAdjustments.cs

@@ -0,0 +1,23 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System.Collections.Generic;
+using osu.Game.Rulesets.Mania.UI;
+using osu.Game.Rulesets.Timing;
+
+namespace osu.Game.Rulesets.Mania.Mods
+{
+    /// <summary>
+    /// A type of mod which generates speed adjustments that scroll the hit objects and bar lines.
+    /// </summary>
+    internal interface IGenerateSpeedAdjustments
+    {
+        /// <summary>
+        /// Applies this mod to a hit renderer.
+        /// </summary>
+        /// <param name="hitRenderer">The hit renderer to apply to.</param>
+        /// <param name="hitObjectTimingChanges">The per-column list of speed adjustments for hit objects.</param>
+        /// <param name="barlineTimingChanges">The list of speed adjustments for bar lines.</param>
+        void ApplyToHitRenderer(ManiaHitRenderer hitRenderer, ref List<SpeedAdjustmentContainer>[] hitObjectTimingChanges, ref List<SpeedAdjustmentContainer> barlineTimingChanges);
+    }
+}

osu.Game.Rulesets.Mania/Mods/ManiaModGravity.cs

@@ -0,0 +1,46 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System.Collections.Generic;
+using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.Mania.UI;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Graphics;
+using osu.Game.Rulesets.Mania.Timing;
+using osu.Game.Rulesets.Timing;
+using osu.Game.Rulesets.Mania.Objects.Drawables;
+
+namespace osu.Game.Rulesets.Mania.Mods
+{
+    public class ManiaModGravity : Mod, IGenerateSpeedAdjustments
+    {
+        public override string Name => "Gravity";
+
+        public override double ScoreMultiplier => 0;
+
+        public override FontAwesome Icon => FontAwesome.fa_sort_desc;
+
+        public void ApplyToHitRenderer(ManiaHitRenderer hitRenderer, ref List<SpeedAdjustmentContainer>[] hitObjectTimingChanges, ref List<SpeedAdjustmentContainer> barlineTimingChanges)
+        {
+            // We have to generate one speed adjustment per hit object for gravity
+            foreach (ManiaHitObject obj in hitRenderer.Objects)
+            {
+                MultiplierControlPoint controlPoint = hitRenderer.CreateControlPointAt(obj.StartTime);
+                // Beat length has too large of an effect for gravity, so we'll force it to a constant value for now
+                controlPoint.TimingPoint.BeatLength = 1000;
+
+                hitObjectTimingChanges[obj.Column].Add(new ManiaSpeedAdjustmentContainer(controlPoint, ScrollingAlgorithm.Gravity));
+            }
+
+            // Like with hit objects, we need to generate one speed adjustment per bar line
+            foreach (DrawableBarLine barLine in hitRenderer.BarLines)
+            {
+                var controlPoint = hitRenderer.CreateControlPointAt(barLine.HitObject.StartTime);
+                // Beat length has too large of an effect for gravity, so we'll force it to a constant value for now
+                controlPoint.TimingPoint.BeatLength = 1000;
+
+                barlineTimingChanges.Add(new ManiaSpeedAdjustmentContainer(controlPoint, ScrollingAlgorithm.Gravity));
+            }
+        }
+    }
+}

osu.Game.Rulesets.Mania/Objects/Drawables/DrawableBarLine.cs

@@ -3,7 +3,7 @@
 
 using OpenTK;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Shapes;
 using osu.Game.Rulesets.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Mania.Objects.Drawables

osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs

@@ -42,7 +42,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             RelativeSizeAxes = Axes.Both;
             Height = (float)HitObject.Duration;
 
-            Add(new Drawable[]
+            AddRange(new Drawable[]
             {
                 // For now the body piece covers the entire height of the container
                 // whereas possibly in the future we don't want to extend under the head/tail.
@@ -55,6 +55,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
                 tickContainer = new Container<DrawableHoldNoteTick>
                 {
                     RelativeSizeAxes = Axes.Both,
+                    RelativeChildOffset = new Vector2(0, (float)HitObject.StartTime),
                     RelativeChildSize = new Vector2(1, (float)HitObject.Duration)
                 },
                 head = new DrawableHeadNote(this, key)
@@ -76,9 +77,6 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
                     HoldStartTime = () => holdStartTime
                 };
 
-                // To make the ticks relative to ourselves we need to offset them backwards
-                drawableTick.Y -= (float)HitObject.StartTime;
-
                 tickContainer.Add(drawableTick);
                 AddNested(drawableTick);
             }

osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTick.cs

@@ -7,9 +7,9 @@ using OpenTK.Graphics;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Sprites;
 using osu.Game.Rulesets.Mania.Judgements;
 using osu.Game.Rulesets.Objects.Drawables;
+using osu.Framework.Graphics.Shapes;
 
 namespace osu.Game.Rulesets.Mania.Objects.Drawables
 {
@@ -70,7 +70,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
             {
                 base.AccentColour = value;
 
-                glowContainer.EdgeEffect = new EdgeEffect
+                glowContainer.EdgeEffect = new EdgeEffectParameters
                 {
                     Type = EdgeEffectType.Glow,
                     Radius = 2f,

osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs

@@ -10,7 +10,7 @@ using osu.Game.Rulesets.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Mania.Objects.Drawables
 {
-    public abstract class DrawableManiaHitObject<TObject> : DrawableHitObject<ManiaHitObject, ManiaJudgement>
+    public abstract class DrawableManiaHitObject<TObject> : DrawableScrollingHitObject<ManiaHitObject, ManiaJudgement>
         where TObject : ManiaHitObject
     {
         /// <summary>

osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs

@@ -23,7 +23,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         public DrawableNote(Note hitObject, Bindable<Key> key = null)
             : base(hitObject, key)
         {
-            RelativeSizeAxes = Axes.Both;
+            RelativeSizeAxes = Axes.X;
             Height = 100;
 
             Add(headPiece = new NotePiece

osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/BodyPiece.cs

@@ -4,7 +4,7 @@
 using OpenTK.Graphics;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
 
 namespace osu.Game.Rulesets.Mania.Objects.Drawables.Pieces

osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/NotePiece.cs

@@ -5,7 +5,7 @@ using OpenTK.Graphics;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
 
 namespace osu.Game.Rulesets.Mania.Objects.Drawables.Pieces

osu.Game.Rulesets.Mania/Objects/HoldNote.cs

@@ -2,8 +2,8 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System.Collections.Generic;
+using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Database;
 using osu.Game.Rulesets.Objects.Types;
 
 namespace osu.Game.Rulesets.Mania.Objects

osu.Game.Rulesets.Mania/Objects/Note.cs

@@ -1,8 +1,8 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Database;
 using osu.Game.Rulesets.Mania.Judgements;
 
 namespace osu.Game.Rulesets.Mania.Objects

osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs

@@ -4,7 +4,6 @@
 using System;
 using System.Linq;
 using osu.Game.Beatmaps;
-using osu.Game.Database;
 using osu.Game.Rulesets.Mania.Judgements;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Objects.Drawables;

osu.Game.Rulesets.Mania/Timing/BasicScrollingDrawableTimingSection.cs

@@ -0,0 +1,27 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Rulesets.Timing;
+
+namespace osu.Game.Rulesets.Mania.Timing
+{
+    /// <summary>
+    /// A <see cref="DrawableTimingSection"/> which scrolls relative to the control point start time.
+    /// </summary>
+    internal class BasicScrollingDrawableTimingSection : DrawableTimingSection
+    {
+        private readonly MultiplierControlPoint controlPoint;
+
+        public BasicScrollingDrawableTimingSection(MultiplierControlPoint controlPoint)
+        {
+            this.controlPoint = controlPoint;
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            Y = (float)(controlPoint.StartTime - Time.Current);
+        }
+    }
+}

osu.Game.Rulesets.Mania/Timing/ControlPointContainer.cs

@@ -1,156 +0,0 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using OpenTK;
-using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Rulesets.Objects;
-
-namespace osu.Game.Rulesets.Mania.Timing
-{
-    /// <summary>
-    /// A container in which added drawables are put into a relative coordinate space spanned by a length of time.
-    /// <para>
-    /// This container contains <see cref="ControlPoint"/>s which scroll inside this container.
-    /// Drawables added to this container are moved inside the relevant <see cref="ControlPoint"/>,
-    /// and as such, will scroll along with the <see cref="ControlPoint"/>s.
-    /// </para>
-    /// </summary>
-    public class ControlPointContainer : Container<Drawable>
-    {
-        /// <summary>
-        /// The amount of time which this container spans.
-        /// </summary>
-        public double TimeSpan { get; set; }
-
-        private readonly List<DrawableControlPoint> drawableControlPoints;
-
-        public ControlPointContainer(IEnumerable<TimingChange> timingChanges)
-        {
-            drawableControlPoints = timingChanges.Select(t => new DrawableControlPoint(t)).ToList();
-            Children = drawableControlPoints;
-        }
-
-        /// <summary>
-        /// Adds a drawable to this container. Note that the drawable added must have its Y-position be
-        /// an absolute unit of time that is _not_ relative to <see cref="TimeSpan"/>.
-        /// </summary>
-        /// <param name="drawable">The drawable to add.</param>
-        public override void Add(Drawable drawable)
-        {
-            // Always add timing sections to ourselves
-            if (drawable is DrawableControlPoint)
-            {
-                base.Add(drawable);
-                return;
-            }
-
-            var controlPoint = drawableControlPoints.LastOrDefault(t => t.CanContain(drawable)) ?? drawableControlPoints.FirstOrDefault();
-
-            if (controlPoint == null)
-                throw new InvalidOperationException("Could not find suitable timing section to add object to.");
-
-            controlPoint.Add(drawable);
-        }
-
-        /// <summary>
-        /// A container that contains drawables within the time span of a timing section.
-        /// <para>
-        /// The content of this container will scroll relative to the current time.
-        /// </para>
-        /// </summary>
-        private class DrawableControlPoint : Container
-        {
-            private readonly TimingChange timingChange;
-
-            protected override Container<Drawable> Content => content;
-            private readonly Container content;
-
-            /// <summary>
-            /// Creates a drawable control point. The height of this container will be proportional
-            /// to the beat length of the control point it is initialized with such that, e.g. a beat length
-            /// of 500ms results in this container being twice as high as its parent, which further means that
-            /// the content container will scroll at twice the normal rate.
-            /// </summary>
-            /// <param name="timingChange">The control point to create the drawable control point for.</param>
-            public DrawableControlPoint(TimingChange timingChange)
-            {
-                this.timingChange = timingChange;
-
-                RelativeSizeAxes = Axes.Both;
-
-                AddInternal(content = new AutoTimeRelativeContainer
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    RelativePositionAxes = Axes.Both,
-                    Y = (float)timingChange.Time
-                });
-            }
-
-            protected override void Update()
-            {
-                var parent = (ControlPointContainer)Parent;
-
-                // Adjust our height to account for the speed changes
-                Height = (float)(1000 / timingChange.BeatLength / timingChange.SpeedMultiplier);
-                RelativeChildSize = new Vector2(1, (float)parent.TimeSpan);
-
-                // Scroll the content
-                content.Y = (float)(timingChange.Time - Time.Current);
-            }
-
-            public override void Add(Drawable drawable)
-            {
-                // The previously relatively-positioned drawable will now become relative to content, but since the drawable has no knowledge of content,
-                // we need to offset it back by content's position position so that it becomes correctly relatively-positioned to content
-                // This can be removed if hit objects were stored such that either their StartTime or their "beat offset" was relative to the timing change
-                // they belonged to, but this requires a radical change to the beatmap format which we're not ready to do just yet
-                drawable.Y -= (float)timingChange.Time;
-
-                base.Add(drawable);
-            }
-
-            /// <summary>
-            /// Whether this control point can contain a drawable. This control point can contain a drawable if the drawable is positioned "after" this control point.
-            /// </summary>
-            /// <param name="drawable">The drawable to check.</param>
-            public bool CanContain(Drawable drawable) => content.Y <= drawable.Y;
-
-            /// <summary>
-            /// A container which always keeps its height and relative coordinate space "auto-sized" to its children.
-            /// <para>
-            /// This is used in the case where children are relatively positioned/sized to time values (e.g. notes/bar lines) to keep
-            /// such children wrapped inside a container, otherwise they would disappear due to container flattening.
-            /// </para>
-            /// </summary>
-            private class AutoTimeRelativeContainer : Container
-            {
-                protected override IComparer<Drawable> DepthComparer => new HitObjectReverseStartTimeComparer();
-
-                public override void InvalidateFromChild(Invalidation invalidation)
-                {
-                    // We only want to re-compute our size when a child's size or position has changed
-                    if ((invalidation & Invalidation.RequiredParentSizeToFit) == 0)
-                    {
-                        base.InvalidateFromChild(invalidation);
-                        return;
-                    }
-
-                    if (!Children.Any())
-                        return;
-
-                    float height = Children.Select(child => child.Y + child.Height).Max();
-
-                    Height = height;
-                    RelativeChildSize = new Vector2(1, height);
-
-                    base.InvalidateFromChild(invalidation);
-                }
-            }
-        }
-    }
-}

osu.Game.Rulesets.Mania/Timing/GravityScrollingDrawableTimingSection.cs

@@ -0,0 +1,60 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Rulesets.Timing;
+
+namespace osu.Game.Rulesets.Mania.Timing
+{
+    /// <summary>
+    /// A <see cref="DrawableTimingSection"/> that emulates a form of gravity where hit objects speed up over time.
+    /// </summary>
+    internal class GravityScrollingDrawableTimingSection : DrawableTimingSection
+    {
+        private readonly MultiplierControlPoint controlPoint;
+
+        public GravityScrollingDrawableTimingSection(MultiplierControlPoint controlPoint)
+        {
+            this.controlPoint = controlPoint;
+        }
+
+        protected override void UpdateAfterChildren()
+        {
+            base.UpdateAfterChildren();
+
+            // The gravity-adjusted start position
+            float startPos = (float)computeGravityTime(controlPoint.StartTime);
+            // The gravity-adjusted end position
+            float endPos = (float)computeGravityTime(controlPoint.StartTime + RelativeChildSize.Y);
+
+            Y = startPos;
+            Height = endPos - startPos;
+        }
+
+        /// <summary>
+        /// Applies gravity to a time value based on the current time.
+        /// </summary>
+        /// <param name="time">The time value gravity should be applied to.</param>
+        /// <returns>The time after gravity is applied to <paramref name="time"/>.</returns>
+        private double computeGravityTime(double time)
+        {
+            double relativeTime = relativeTimeAt(time);
+
+            // The sign of the relative time, this is used to apply backwards acceleration leading into startTime
+            double sign = relativeTime < 0 ? -1 : 1;
+
+            return VisibleTimeRange - acceleration * relativeTime * relativeTime * sign;
+        }
+
+        /// <summary>
+        /// The acceleration due to "gravity" of the content of this container.
+        /// </summary>
+        private double acceleration => 1 / VisibleTimeRange;
+
+        /// <summary>
+        /// Computes the current time relative to <paramref name="time"/>, accounting for <see cref="DrawableTimingSection.VisibleTimeRange"/>.
+        /// </summary>
+        /// <param name="time">The non-offset time.</param>
+        /// <returns>The current time relative to <paramref name="time"/> - <see cref="DrawableTimingSection.VisibleTimeRange"/>. </returns>
+        private double relativeTimeAt(double time) => Time.Current - time + VisibleTimeRange;
+    }
+}

osu.Game.Rulesets.Mania/Timing/ManiaSpeedAdjustmentContainer.cs

@@ -0,0 +1,30 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Rulesets.Timing;
+
+namespace osu.Game.Rulesets.Mania.Timing
+{
+    public class ManiaSpeedAdjustmentContainer : SpeedAdjustmentContainer
+    {
+        private readonly ScrollingAlgorithm scrollingAlgorithm;
+
+        public ManiaSpeedAdjustmentContainer(MultiplierControlPoint timingSection, ScrollingAlgorithm scrollingAlgorithm)
+            : base(timingSection)
+        {
+            this.scrollingAlgorithm = scrollingAlgorithm;
+        }
+
+        protected override DrawableTimingSection CreateTimingSection()
+        {
+            switch (scrollingAlgorithm)
+            {
+                default:
+                case ScrollingAlgorithm.Basic:
+                    return new BasicScrollingDrawableTimingSection(ControlPoint);
+                case ScrollingAlgorithm.Gravity:
+                    return new GravityScrollingDrawableTimingSection(ControlPoint);
+            }
+        }
+    }
+}

osu.Game.Rulesets.Mania/Timing/ScrollingAlgorithm.cs

@@ -0,0 +1,17 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+namespace osu.Game.Rulesets.Mania.Timing
+{
+    public enum ScrollingAlgorithm
+    {
+        /// <summary>
+        /// Basic scrolling algorithm based on the timing section time. This is the default algorithm.
+        /// </summary>
+        Basic,
+        /// <summary>
+        /// Emulating a form of gravity where hit objects speed up over time.
+        /// </summary>
+        Gravity
+    }
+}

osu.Game.Rulesets.Mania/Timing/TimingChange.cs

@@ -1,23 +0,0 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-namespace osu.Game.Rulesets.Mania.Timing
-{
-    public class TimingChange
-    {
-        /// <summary>
-        /// The time at which this timing change happened.
-        /// </summary>
-        public double Time;
-
-        /// <summary>
-        /// The beat length.
-        /// </summary>
-        public double BeatLength = 500;
-
-        /// <summary>
-        /// The speed multiplier.
-        /// </summary>
-        public double SpeedMultiplier = 1;
-    }
-}

osu.Game.Rulesets.Mania/UI/Column.cs

@@ -7,17 +7,14 @@ using OpenTK.Input;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Input;
 using osu.Game.Graphics;
-using osu.Game.Rulesets.Mania.Timing;
-using System.Collections.Generic;
 using osu.Game.Rulesets.Objects.Drawables;
-using osu.Game.Rulesets.Mania.Objects;
-using osu.Game.Rulesets.Mania.Judgements;
 using System;
 using osu.Framework.Configuration;
+using osu.Game.Rulesets.Timing;
 
 namespace osu.Game.Rulesets.Mania.UI
 {
@@ -33,6 +30,13 @@ namespace osu.Game.Rulesets.Mania.UI
         private const float column_width = 45;
         private const float special_column_width = 70;
 
+        private readonly BindableDouble visibleTimeRange = new BindableDouble();
+        public BindableDouble VisibleTimeRange
+        {
+            get { return visibleTimeRange; }
+            set { visibleTimeRange.BindTo(value); }
+        }
+
         /// <summary>
         /// The key that will trigger input actions for this column and hit objects contained inside it.
         /// </summary>
@@ -42,9 +46,9 @@ namespace osu.Game.Rulesets.Mania.UI
         private readonly Container hitTargetBar;
         private readonly Container keyIcon;
 
-        public readonly ControlPointContainer ControlPointContainer;
+        private readonly SpeedAdjustmentCollection speedAdjustments;
 
-        public Column(IEnumerable<TimingChange> timingChanges)
+        public Column()
         {
             RelativeSizeAxes = Axes.Y;
             Width = column_width;
@@ -93,10 +97,11 @@ namespace osu.Game.Rulesets.Mania.UI
                                 }
                             }
                         },
-                        ControlPointContainer = new ControlPointContainer(timingChanges)
+                        speedAdjustments = new SpeedAdjustmentCollection(Axes.Y)
                         {
                             Name = "Hit objects",
                             RelativeSizeAxes = Axes.Both,
+                            VisibleTimeRange = VisibleTimeRange
                         },
                         // For column lighting, we need to capture input events before the notes
                         new InputTarget
@@ -117,7 +122,7 @@ namespace osu.Game.Rulesets.Mania.UI
                         {
                             Name = "Key gradient",
                             RelativeSizeAxes = Axes.Both,
-                            ColourInfo = ColourInfo.GradientVertical(Color4.Black, Color4.Black.Opacity(0)),
+                            Colour = ColourInfo.GradientVertical(Color4.Black, Color4.Black.Opacity(0)),
                             Alpha = 0.5f
                         },
                         keyIcon = new Container
@@ -171,14 +176,14 @@ namespace osu.Game.Rulesets.Mania.UI
 
                 background.Colour = accentColour;
 
-                hitTargetBar.EdgeEffect = new EdgeEffect
+                hitTargetBar.EdgeEffect = new EdgeEffectParameters
                 {
                     Type = EdgeEffectType.Glow,
                     Radius = 5,
                     Colour = accentColour.Opacity(0.5f),
                 };
 
-                keyIcon.EdgeEffect = new EdgeEffect
+                keyIcon.EdgeEffect = new EdgeEffectParameters
                 {
                     Type = EdgeEffectType.Glow,
                     Radius = 5,
@@ -187,10 +192,11 @@ namespace osu.Game.Rulesets.Mania.UI
             }
         }
 
-        public void Add(DrawableHitObject<ManiaHitObject, ManiaJudgement> hitObject)
+        public void Add(SpeedAdjustmentContainer speedAdjustment) => speedAdjustments.Add(speedAdjustment);
+        public void Add(DrawableHitObject hitObject)
         {
             hitObject.AccentColour = AccentColour;
-            ControlPointContainer.Add(hitObject);
+            speedAdjustments.Add(hitObject);
         }
 
         private bool onKeyDown(InputState state, KeyDownEventArgs args)
@@ -200,8 +206,8 @@ namespace osu.Game.Rulesets.Mania.UI
 
             if (args.Key == Key)
             {
-                background.FadeTo(background.Alpha + 0.2f, 50, EasingTypes.OutQuint);
-                keyIcon.ScaleTo(1.4f, 50, EasingTypes.OutQuint);
+                background.FadeTo(background.Alpha + 0.2f, 50, Easing.OutQuint);
+                keyIcon.ScaleTo(1.4f, 50, Easing.OutQuint);
             }
 
             return false;
@@ -211,8 +217,8 @@ namespace osu.Game.Rulesets.Mania.UI
         {
             if (args.Key == Key)
             {
-                background.FadeTo(0.2f, 800, EasingTypes.OutQuart);
-                keyIcon.ScaleTo(1f, 400, EasingTypes.OutQuart);
+                background.FadeTo(0.2f, 800, Easing.OutQuart);
+                keyIcon.ScaleTo(1f, 400, Easing.OutQuart);
             }
 
             return false;

osu.Game.Rulesets.Mania/UI/ManiaHitRenderer.cs

@@ -8,6 +8,7 @@ using OpenTK;
 using OpenTK.Input;
 using osu.Framework.Allocation;
 using osu.Framework.Configuration;
+using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Lists;
 using osu.Framework.MathUtils;
@@ -16,6 +17,7 @@ using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Beatmaps;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Judgements;
+using osu.Game.Rulesets.Mania.Mods;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
 using osu.Game.Rulesets.Mania.Scoring;
@@ -23,78 +25,44 @@ using osu.Game.Rulesets.Mania.Timing;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.Timing;
 using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Mania.UI
 {
-    public class ManiaHitRenderer : HitRenderer<ManiaHitObject, ManiaJudgement>
+    public class ManiaHitRenderer : SpeedAdjustedHitRenderer<ManiaHitObject, ManiaJudgement>
     {
-        public int? Columns;
+        /// <summary>
+        /// Preferred column count. This will only have an effect during the initialization of the play field.
+        /// </summary>
+        public int PreferredColumns;
+
+        public IEnumerable<DrawableBarLine> BarLines;
+
+        /// <summary>
+        /// Per-column timing changes.
+        /// </summary>
+        private readonly List<SpeedAdjustmentContainer>[] hitObjectSpeedAdjustments;
+
+        /// <summary>
+        /// Bar line timing changes.
+        /// </summary>
+        private readonly List<SpeedAdjustmentContainer> barLineSpeedAdjustments = new List<SpeedAdjustmentContainer>();
 
         public ManiaHitRenderer(WorkingBeatmap beatmap, bool isForCurrentRuleset)
             : base(beatmap, isForCurrentRuleset)
         {
-        }
-
-        protected override Playfield<ManiaHitObject, ManiaJudgement> CreatePlayfield()
-        {
-            double lastSpeedMultiplier = 1;
-            double lastBeatLength = 500;
-
-            // Merge timing + difficulty points
-            var allPoints = new SortedList<ControlPoint>(Comparer<ControlPoint>.Default);
-            allPoints.AddRange(Beatmap.ControlPointInfo.TimingPoints);
-            allPoints.AddRange(Beatmap.ControlPointInfo.DifficultyPoints);
-
-            // Generate the timing points, making non-timing changes use the previous timing change
-            var timingChanges = allPoints.Select(c =>
-            {
-                var timingPoint = c as TimingControlPoint;
-                var difficultyPoint = c as DifficultyControlPoint;
-
-                if (timingPoint != null)
-                    lastBeatLength = timingPoint.BeatLength;
-
-                if (difficultyPoint != null)
-                    lastSpeedMultiplier = difficultyPoint.SpeedMultiplier;
-
-                return new TimingChange
-                {
-                    Time = c.Time,
-                    BeatLength = lastBeatLength,
-                    SpeedMultiplier = lastSpeedMultiplier
-                };
-            });
-
-            double lastObjectTime = (Objects.LastOrDefault() as IHasEndTime)?.EndTime ?? Objects.LastOrDefault()?.StartTime ?? double.MaxValue;
-
-            // Perform some post processing of the timing changes
-            timingChanges = timingChanges
-                // Collapse sections after the last hit object
-                .Where(s => s.Time <= lastObjectTime)
-                // Collapse sections with the same start time
-                .GroupBy(s => s.Time).Select(g => g.Last()).OrderBy(s => s.Time)
-                // Collapse sections with the same beat length
-                .GroupBy(s => s.BeatLength * s.SpeedMultiplier).Select(g => g.First())
-                .ToList();
-
-            return new ManiaPlayfield(Columns ?? (int)Math.Round(Beatmap.BeatmapInfo.Difficulty.CircleSize), timingChanges)
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                // Invert by default for now (should be moved to config/skin later)
-                Scale = new Vector2(1, -1)
-            };
-        }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            var maniaPlayfield = (ManiaPlayfield)Playfield;
+            // Generate the speed adjustment container lists
+            hitObjectSpeedAdjustments = new List<SpeedAdjustmentContainer>[PreferredColumns];
+            for (int i = 0; i < PreferredColumns; i++)
+                hitObjectSpeedAdjustments[i] = new List<SpeedAdjustmentContainer>();
 
+            // Generate the bar lines
             double lastObjectTime = (Objects.LastOrDefault() as IHasEndTime)?.EndTime ?? Objects.LastOrDefault()?.StartTime ?? double.MaxValue;
 
             SortedList<TimingControlPoint> timingPoints = Beatmap.ControlPointInfo.TimingPoints;
+            var barLines = new List<DrawableBarLine>();
+
             for (int i = 0; i < timingPoints.Count; i++)
             {
                 TimingControlPoint point = timingPoints[i];
@@ -105,7 +73,7 @@ namespace osu.Game.Rulesets.Mania.UI
                 int index = 0;
                 for (double t = timingPoints[i].Time; Precision.DefinitelyBigger(endTime, t); t += point.BeatLength, index++)
                 {
-                    maniaPlayfield.Add(new DrawableBarLine(new BarLine
+                    barLines.Add(new DrawableBarLine(new BarLine
                     {
                         StartTime = t,
                         ControlPoint = point,
@@ -113,17 +81,78 @@ namespace osu.Game.Rulesets.Mania.UI
                     }));
                 }
             }
+
+            BarLines = barLines;
+
+            // Generate speed adjustments from mods first
+            bool useDefaultSpeedAdjustments = true;
+
+            if (Mods != null)
+            {
+                foreach (var speedAdjustmentMod in Mods.OfType<IGenerateSpeedAdjustments>())
+                {
+                    useDefaultSpeedAdjustments = false;
+                    speedAdjustmentMod.ApplyToHitRenderer(this, ref hitObjectSpeedAdjustments, ref barLineSpeedAdjustments);
+                }
+            }
+
+            // Generate the default speed adjustments
+            if (useDefaultSpeedAdjustments)
+                generateDefaultSpeedAdjustments();
         }
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            var maniaPlayfield = (ManiaPlayfield)Playfield;
+
+            BarLines.ForEach(maniaPlayfield.Add);
+        }
+
+        protected override void ApplyBeatmap()
+        {
+            base.ApplyBeatmap();
+
+            PreferredColumns = (int)Math.Max(1, Math.Round(Beatmap.BeatmapInfo.Difficulty.CircleSize));
+        }
+
+        protected override void ApplySpeedAdjustments()
+        {
+            var maniaPlayfield = (ManiaPlayfield)Playfield;
+
+            for (int i = 0; i < PreferredColumns; i++)
+                foreach (var change in hitObjectSpeedAdjustments[i])
+                    maniaPlayfield.Columns.ElementAt(i).Add(change);
+
+            foreach (var change in barLineSpeedAdjustments)
+                maniaPlayfield.Add(change);
+        }
+
+        private void generateDefaultSpeedAdjustments()
+        {
+            DefaultControlPoints.ForEach(c =>
+            {
+                foreach (List<SpeedAdjustmentContainer> t in hitObjectSpeedAdjustments)
+                    t.Add(new ManiaSpeedAdjustmentContainer(c, ScrollingAlgorithm.Basic));
+                barLineSpeedAdjustments.Add(new ManiaSpeedAdjustmentContainer(c, ScrollingAlgorithm.Basic));
+            });
+        }
+
+        protected sealed override Playfield<ManiaHitObject, ManiaJudgement> CreatePlayfield() => new ManiaPlayfield(PreferredColumns)
+        {
+            Anchor = Anchor.Centre,
+            Origin = Anchor.Centre,
+            // Invert by default for now (should be moved to config/skin later)
+            Scale = new Vector2(1, -1)
+        };
+
         public override ScoreProcessor CreateScoreProcessor() => new ManiaScoreProcessor(this);
 
         protected override BeatmapConverter<ManiaHitObject> CreateBeatmapConverter() => new ManiaBeatmapConverter();
 
         protected override DrawableHitObject<ManiaHitObject, ManiaJudgement> GetVisualRepresentation(ManiaHitObject h)
         {
-            var maniaPlayfield = Playfield as ManiaPlayfield;
-            if (maniaPlayfield == null)
-                return null;
+            var maniaPlayfield = (ManiaPlayfield)Playfield;
 
             Bindable<Key> key = maniaPlayfield.Columns.ElementAt(h.Column).Key;
 

osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Sprites;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.UI;
 using OpenTK;
@@ -15,13 +14,12 @@ using osu.Framework.Allocation;
 using OpenTK.Input;
 using System.Linq;
 using System.Collections.Generic;
-using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Game.Rulesets.Objects.Drawables;
-using osu.Game.Rulesets.Mania.Timing;
 using osu.Framework.Input;
-using osu.Framework.Graphics.Transforms;
-using osu.Framework.MathUtils;
 using osu.Game.Rulesets.Mania.Objects.Drawables;
+using osu.Game.Rulesets.Timing;
+using osu.Framework.Configuration;
+using osu.Framework.Graphics.Shapes;
 
 namespace osu.Game.Rulesets.Mania.UI
 {
@@ -29,10 +27,10 @@ namespace osu.Game.Rulesets.Mania.UI
     {
         public const float HIT_TARGET_POSITION = 50;
 
-        private const float time_span_default = 5000;
-        private const float time_span_min = 10;
-        private const float time_span_max = 50000;
-        private const float time_span_step = 200;
+        private const double time_span_default = 1500;
+        private const double time_span_min = 50;
+        private const double time_span_max = 10000;
+        private const double time_span_step = 50;
 
         /// <summary>
         /// Default column keys, expanding outwards from the middle as more column are added.
@@ -58,14 +56,20 @@ namespace osu.Game.Rulesets.Mania.UI
         private readonly FlowContainer<Column> columns;
         public IEnumerable<Column> Columns => columns.Children;
 
-        private readonly ControlPointContainer barLineContainer;
+        private readonly BindableDouble visibleTimeRange = new BindableDouble(time_span_default)
+        {
+            MinValue = time_span_min,
+            MaxValue = time_span_max
+        };
+
+        private readonly SpeedAdjustmentCollection barLineContainer;
 
         private List<Color4> normalColumnColours = new List<Color4>();
         private Color4 specialColumnColour;
 
         private readonly int columnCount;
 
-        public ManiaPlayfield(int columnCount, IEnumerable<TimingChange> timingChanges)
+        public ManiaPlayfield(int columnCount)
         {
             this.columnCount = columnCount;
 
@@ -116,12 +120,13 @@ namespace osu.Game.Rulesets.Mania.UI
                             Padding = new MarginPadding { Top = HIT_TARGET_POSITION },
                             Children = new[]
                             {
-                                barLineContainer = new ControlPointContainer(timingChanges)
+                                barLineContainer = new SpeedAdjustmentCollection(Axes.Y)
                                 {
                                     Name = "Bar lines",
                                     Anchor = Anchor.TopCentre,
                                     Origin = Anchor.TopCentre,
-                                    RelativeSizeAxes = Axes.Y
+                                    RelativeSizeAxes = Axes.Y,
+                                    VisibleTimeRange = visibleTimeRange
                                     // Width is set in the Update method
                                 }
                             }
@@ -131,9 +136,7 @@ namespace osu.Game.Rulesets.Mania.UI
             };
 
             for (int i = 0; i < columnCount; i++)
-                columns.Add(new Column(timingChanges));
-
-            TimeSpan = time_span_default;
+                columns.Add(new Column { VisibleTimeRange = visibleTimeRange });
         }
 
         [BackgroundDependencyLoader]
@@ -208,6 +211,7 @@ namespace osu.Game.Rulesets.Mania.UI
 
         public override void Add(DrawableHitObject<ManiaHitObject, ManiaJudgement> h) => Columns.ElementAt(h.HitObject.Column).Add(h);
         public void Add(DrawableBarLine barline) => barLineContainer.Add(barline);
+        public void Add(SpeedAdjustmentContainer speedAdjustment) => barLineContainer.Add(speedAdjustment);
 
         protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
         {
@@ -216,10 +220,10 @@ namespace osu.Game.Rulesets.Mania.UI
                 switch (args.Key)
                 {
                     case Key.Minus:
-                        transformTimeSpanTo(TimeSpan + time_span_step, 200, EasingTypes.OutQuint);
+                        transformVisibleTimeRangeTo(visibleTimeRange + time_span_step, 200, Easing.OutQuint);
                         break;
                     case Key.Plus:
-                        transformTimeSpanTo(TimeSpan - time_span_step, 200, EasingTypes.OutQuint);
+                        transformVisibleTimeRangeTo(visibleTimeRange - time_span_step, 200, Easing.OutQuint);
                         break;
                 }
             }
@@ -227,29 +231,9 @@ namespace osu.Game.Rulesets.Mania.UI
             return false;
         }
 
-        private double timeSpan;
-        /// <summary>
-        /// The amount of time which the length of the playfield spans.
-        /// </summary>
-        public double TimeSpan
+        private void transformVisibleTimeRangeTo(double newTimeRange, double duration = 0, Easing easing = Easing.None)
         {
-            get { return timeSpan; }
-            set
-            {
-                if (timeSpan == value)
-                    return;
-                timeSpan = value;
-
-                timeSpan = MathHelper.Clamp(timeSpan, time_span_min, time_span_max);
-
-                barLineContainer.TimeSpan = value;
-                Columns.ForEach(c => c.ControlPointContainer.TimeSpan = value);
-            }
-        }
-
-        private void transformTimeSpanTo(double newTimeSpan, double duration = 0, EasingTypes easing = EasingTypes.None)
-        {
-            TransformTo(() => TimeSpan, newTimeSpan, duration, easing, new TransformTimeSpan());
+            this.TransformTo(nameof(visibleTimeRange), newTimeRange, duration, easing);
         }
 
         protected override void Update()
@@ -258,28 +242,5 @@ namespace osu.Game.Rulesets.Mania.UI
             // While masking on effectively only the Y-axis, so we need to set the width of the bar line container manually
             barLineContainer.Width = columns.Width;
         }
-
-        private class TransformTimeSpan : Transform<double>
-        {
-            public override double CurrentValue
-            {
-                get
-                {
-                    double time = Time?.Current ?? 0;
-                    if (time < StartTime) return StartValue;
-                    if (time >= EndTime) return EndValue;
-
-                    return Interpolation.ValueAt(time, StartValue, EndValue, StartTime, EndTime, Easing);
-                }
-            }
-
-            public override void Apply(Drawable d)
-            {
-                base.Apply(d);
-
-                var p = (ManiaPlayfield)d;
-                p.TimeSpan = CurrentValue;
-            }
-        }
     }
 }

osu.Game.Rulesets.Mania/osu.Game.Rulesets.Mania.csproj

@@ -33,8 +33,9 @@
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="OpenTK, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.2.0.50727.1341\lib\net45\OpenTK.dll</HintPath>
+    <Reference Include="OpenTK, Version=3.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.3.0\lib\net45\OpenTK.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -62,6 +63,7 @@
     <Compile Include="Judgements\ManiaHitResult.cs" />
     <Compile Include="Judgements\ManiaJudgement.cs" />
     <Compile Include="ManiaDifficultyCalculator.cs" />
+    <Compile Include="Mods\IGenerateSpeedAdjustments.cs" />
     <Compile Include="Objects\Drawables\DrawableBarLine.cs" />
     <Compile Include="Objects\Drawables\DrawableHoldNote.cs" />
     <Compile Include="Objects\Drawables\DrawableHoldNoteTick.cs" />
@@ -77,14 +79,17 @@
     <Compile Include="Objects\ManiaHitObject.cs" />
     <Compile Include="Objects\Note.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Timing\BasicScrollingDrawableTimingSection.cs" />
+    <Compile Include="Timing\GravityScrollingDrawableTimingSection.cs" />
+    <Compile Include="Timing\ScrollingAlgorithm.cs" />
     <Compile Include="UI\Column.cs" />
     <Compile Include="UI\ManiaHitRenderer.cs" />
     <Compile Include="UI\ManiaPlayfield.cs" />
     <Compile Include="ManiaRuleset.cs" />
     <Compile Include="Mods\ManiaMod.cs" />
+    <Compile Include="Mods\ManiaModGravity.cs" />
     <Compile Include="UI\SpecialColumnPosition.cs" />
-    <Compile Include="Timing\ControlPointContainer.cs" />
-    <Compile Include="Timing\TimingChange.cs" />
+    <Compile Include="Timing\ManiaSpeedAdjustmentContainer.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\osu-framework\osu.Framework\osu.Framework.csproj">

osu.Game.Rulesets.Mania/packages.config

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <!--
 Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 -->
 <packages>
-  <package id="ppy.OpenTK" version="2.0.50727.1341" targetFramework="net45" />
+  <package id="ppy.OpenTK" version="3.0" targetFramework="net45" />
 </packages>

osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPoint.cs

@@ -6,7 +6,7 @@ using OpenTK.Graphics;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Shapes;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
 {
@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
             Masking = true;
             AutoSizeAxes = Axes.Both;
             CornerRadius = width / 2;
-            EdgeEffect = new EdgeEffect
+            EdgeEffect = new EdgeEffectParameters
             {
                 Type = EdgeEffectType.Glow,
                 Colour = Color4.White.Opacity(0.2f),

osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs

@@ -94,12 +94,11 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
                         using (fp.BeginAbsoluteSequence(fadeInTime))
                         {
                             fp.FadeIn(DrawableOsuHitObject.TIME_FADEIN);
-                            fp.ScaleTo(1, DrawableOsuHitObject.TIME_FADEIN, EasingTypes.Out);
+                            fp.ScaleTo(1, DrawableOsuHitObject.TIME_FADEIN, Easing.Out);
 
-                            fp.MoveTo(pointEndPosition, DrawableOsuHitObject.TIME_FADEIN, EasingTypes.Out);
+                            fp.MoveTo(pointEndPosition, DrawableOsuHitObject.TIME_FADEIN, Easing.Out);
 
-                            fp.Delay(fadeOutTime - fadeInTime);
-                            fp.FadeOut(DrawableOsuHitObject.TIME_FADEIN);
+                            fp.Delay(fadeOutTime - fadeInTime).FadeOut(DrawableOsuHitObject.TIME_FADEIN);
                         }
 
                         fp.Expire(true);

osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs

@@ -89,11 +89,15 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             base.UpdateInitialState();
 
-            //sane defaults
-            ring.Alpha = circle.Alpha = number.Alpha = glow.Alpha = 1;
-            ApproachCircle.Alpha = 0;
-            ApproachCircle.Scale = new Vector2(4);
-            explode.Alpha = 0;
+            // sane defaults
+            ring.Show();
+            circle.Show();
+            number.Show();
+            glow.Show();
+
+            ApproachCircle.Hide();
+            ApproachCircle.ScaleTo(new Vector2(4));
+            explode.Hide();
         }
 
         protected override void UpdatePreemptState()
@@ -106,43 +110,42 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         protected override void UpdateCurrentState(ArmedState state)
         {
-            ApproachCircle.FadeOut();
+            double duration = ((HitObject as IHasEndTime)?.EndTime ?? HitObject.StartTime) - HitObject.StartTime;
 
-            double endTime = (HitObject as IHasEndTime)?.EndTime ?? HitObject.StartTime;
-            double duration = endTime - HitObject.StartTime;
-
-            glow.Delay(duration);
-            glow.FadeOut(400);
+            glow.Delay(duration).FadeOut(400);
 
             switch (state)
             {
                 case ArmedState.Idle:
-                    Delay(duration + TIME_PREEMPT);
-                    FadeOut(TIME_FADEOUT);
+                    this.Delay(duration + TIME_PREEMPT).FadeOut(TIME_FADEOUT);
                     Expire(true);
                     break;
                 case ArmedState.Miss:
-                    FadeOut(TIME_FADEOUT / 5);
+                    ApproachCircle.FadeOut(50);
+                    this.FadeOut(TIME_FADEOUT / 5);
                     Expire();
                     break;
                 case ArmedState.Hit:
-                    const double flash_in = 40;
+                    ApproachCircle.FadeOut(50);
 
-                    flash.FadeTo(0.8f, flash_in);
-                    flash.Delay(flash_in);
-                    flash.FadeOut(100);
+                    const double flash_in = 40;
+                    flash.FadeTo(0.8f, flash_in)
+                         .Then()
+                         .FadeOut(100);
 
                     explode.FadeIn(flash_in);
 
-                    Delay(flash_in, true);
+                    using (BeginDelayedSequence(flash_in, true))
+                    {
+                        //after the flash, we can hide some elements that were behind it
+                        ring.FadeOut();
+                        circle.FadeOut();
+                        number.FadeOut();
 
-                    //after the flash, we can hide some elements that were behind it
-                    ring.FadeOut();
-                    circle.FadeOut();
-                    number.FadeOut();
+                        this.FadeOut(800)
+                            .ScaleTo(Scale * 1.5f, 400, Easing.OutQuad);
+                    }
 
-                    FadeOut(800);
-                    ScaleTo(Scale * 1.5f, 400, EasingTypes.OutQuad);
                     Expire();
                     break;
             }

osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs

@@ -4,6 +4,7 @@
 using System.ComponentModel;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Judgements;
+using osu.Framework.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
@@ -17,18 +18,19 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             : base(hitObject)
         {
             AccentColour = HitObject.ComboColour;
+            Alpha = 0;
         }
 
         protected override OsuJudgement CreateJudgement() => new OsuJudgement { MaxScore = OsuScoreResult.Hit300 };
 
         protected sealed override void UpdateState(ArmedState state)
         {
-            Flush();
-
-            UpdateInitialState();
+            FinishTransforms();
 
             using (BeginAbsoluteSequence(HitObject.StartTime - TIME_PREEMPT, true))
             {
+                UpdateInitialState();
+
                 UpdatePreemptState();
 
                 using (BeginDelayedSequence(TIME_PREEMPT + Judgement.TimeOffset, true))
@@ -36,18 +38,18 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             }
         }
 
-        protected virtual void UpdateCurrentState(ArmedState state)
+        protected virtual void UpdateInitialState()
         {
+            Hide();
         }
 
         protected virtual void UpdatePreemptState()
         {
-            FadeIn(TIME_FADEIN);
+            this.FadeIn(TIME_FADEIN);
         }
 
-        protected virtual void UpdateInitialState()
+        protected virtual void UpdateCurrentState(ArmedState state)
         {
-            Alpha = 0;
         }
     }
 

osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs

@@ -18,7 +18,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         protected override void LoadComplete()
         {
             if (Judgement.Result != HitResult.Miss)
-                JudgementText.TransformSpacingTo(new Vector2(14, 0), 1800, EasingTypes.OutQuint);
+                JudgementText.TransformSpacingTo(new Vector2(14, 0), 1800, Easing.OutQuint);
 
             base.LoadComplete();
         }

osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs

@@ -28,10 +28,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         public DrawableSlider(Slider s) : base(s)
         {
-            // Since the DrawableSlider itself is just a container without a size we need to
-            // pass all input through.
-            AlwaysReceiveInput = true;
-
             SliderBouncer bouncer1;
             slider = s;
 
@@ -129,7 +125,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             if (!userTriggered && Time.Current >= slider.EndTime)
             {
-                var ticksCount = ticks.Children.Count() + 1;
+                var ticksCount = ticks.Children.Count + 1;
                 var ticksHit = ticks.Children.Count(t => t.Judgement.Result == HitResult.Hit);
                 if (initialCircle.Judgement.Result == HitResult.Hit)
                     ticksHit++;
@@ -162,14 +158,14 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             ball.FadeIn();
 
-            Delay(slider.Duration, true);
+            using (BeginDelayedSequence(slider.Duration, true))
+            {
+                body.FadeOut(160);
+                ball.FadeOut(160);
 
-            body.FadeOut(160);
-            ball.FadeOut(160);
-
-            FadeOut(800);
-
-            Expire();
+                this.FadeOut(800)
+                    .Expire();
+            }
         }
 
         public Drawable ProxiedLayer => initialCircle.ApproachCircle;

osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs

@@ -3,11 +3,11 @@
 
 using System;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Sprites;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Judgements;
 using OpenTK;
 using OpenTK.Graphics;
+using osu.Framework.Graphics.Shapes;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
@@ -62,14 +62,12 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             var animIn = Math.Min(150, sliderTick.StartTime - FadeInTime);
 
-            ScaleTo(0.5f);
-            ScaleTo(1.2f, animIn);
-            FadeIn(animIn);
-
-            Delay(animIn);
-            ScaleTo(1, 150, EasingTypes.Out);
-
-            Delay(-animIn);
+            this.Animate(
+                d => d.FadeIn(animIn),
+                d => d.ScaleTo(0.5f).ScaleTo(1.2f, animIn)
+            ).Then(
+                d => d.ScaleTo(1, 150, Easing.Out)
+            );
         }
 
         protected override void UpdateCurrentState(ArmedState state)
@@ -77,16 +75,15 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             switch (state)
             {
                 case ArmedState.Idle:
-                    Delay(FadeOutTime - sliderTick.StartTime);
-                    FadeOut();
+                    this.Delay(FadeOutTime - sliderTick.StartTime).FadeOut();
                     break;
                 case ArmedState.Miss:
-                    FadeOut(160);
-                    FadeColour(Color4.Red, 80);
+                    this.FadeOut(160)
+                        .FadeColour(Color4.Red, 80);
                     break;
                 case ArmedState.Hit:
-                    FadeOut(120, EasingTypes.OutQuint);
-                    ScaleTo(Scale * 1.5f, 120, EasingTypes.OutQuint);
+                    this.FadeOut(120, Easing.OutQuint)
+                        .ScaleTo(Scale * 1.5f, 120, Easing.OutQuint);
                     break;
             }
         }

osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs

@@ -38,8 +38,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         public DrawableSpinner(Spinner s) : base(s)
         {
-            AlwaysReceiveInput = true;
-
             Origin = Anchor.Centre;
             Position = s.Position;
 
@@ -176,9 +174,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             ticks.Rotation = disc.Rotation;
 
             float relativeCircleScale = spinner.Scale * circle.DrawHeight / mainContainer.DrawHeight;
-            disc.ScaleTo(relativeCircleScale + (1 - relativeCircleScale) * Progress, 200, EasingTypes.OutQuint);
+            disc.ScaleTo(relativeCircleScale + (1 - relativeCircleScale) * Progress, 200, Easing.OutQuint);
 
-            symbol.RotateTo(disc.Rotation / 2, 500, EasingTypes.OutQuint);
+            symbol.RotateTo(disc.Rotation / 2, 500, Easing.OutQuint);
         }
 
         protected override void UpdatePreemptState()
@@ -186,35 +184,33 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             base.UpdatePreemptState();
 
             circleContainer.ScaleTo(spinner.Scale * 0.3f);
-            circleContainer.ScaleTo(spinner.Scale, TIME_PREEMPT / 1.4f, EasingTypes.OutQuint);
+            circleContainer.ScaleTo(spinner.Scale, TIME_PREEMPT / 1.4f, Easing.OutQuint);
 
             disc.RotateTo(-720);
             symbol.RotateTo(-720);
 
-            mainContainer.ScaleTo(0);
-            mainContainer.ScaleTo(spinner.Scale * circle.DrawHeight / DrawHeight * 1.4f, TIME_PREEMPT - 150, EasingTypes.OutQuint);
-
-            mainContainer.Delay(TIME_PREEMPT - 150);
-            mainContainer.ScaleTo(1, 500, EasingTypes.OutQuint);
+            mainContainer
+                .ScaleTo(0)
+                .ScaleTo(spinner.Scale * circle.DrawHeight / DrawHeight * 1.4f, TIME_PREEMPT - 150, Easing.OutQuint)
+                .Then()
+                .ScaleTo(1, 500, Easing.OutQuint);
         }
 
         protected override void UpdateCurrentState(ArmedState state)
         {
-            Delay(spinner.Duration, true);
-
-            FadeOut(160);
+            var sequence = this.Delay(spinner.Duration).FadeOut(160);
 
             switch (state)
             {
                 case ArmedState.Hit:
-                    ScaleTo(Scale * 1.2f, 320, EasingTypes.Out);
-                    Expire();
+                    sequence.ScaleTo(Scale * 1.2f, 320, Easing.Out);
                     break;
                 case ArmedState.Miss:
-                    ScaleTo(Scale * 0.8f, 320, EasingTypes.In);
-                    Expire();
+                    sequence.ScaleTo(Scale * 0.8f, 320, Easing.In);
                     break;
             }
+
+            Expire();
         }
     }
 }

osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/FlashPiece.cs

@@ -3,8 +3,8 @@
 
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Sprites;
 using OpenTK;
+using osu.Framework.Graphics.Shapes;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 {