Merge pull request #363 from DrabWeb/song-progress-graph

Song Progress
Trim whitespace.
2026-05-16 10:22:53 +08:00 · 2017-04-15 01:37:25 +09:00 · 2017-04-15 01:31:42 +09:00 · 2017-04-15 01:29:02 +09:00 · 2017-04-14 23:50:08 +09:00 · 2017-04-14 20:17:17 +09:00
137 changed files with 2470 additions and 714 deletions
@@ -11,7 +11,7 @@
            "preLaunchTask": "build",
            "runtimeExecutable": null,
            "env": {},
-            "externalConsole": false
+            "console": "internalConsole"
        },
        {
            "name": "Launch Desktop",
@@ -23,7 +23,7 @@
            "preLaunchTask": "build",
            "runtimeExecutable": null,
            "env": {},
-            "externalConsole": false
+            "console": "internalConsole"
        },
        {
            "name": "Attach",
@@ -2,25 +2,23 @@
    // See https://go.microsoft.com/fwlink/?LinkId=733558
    // for the documentation about the tasks.json format
    "version": "0.1.0",
-    "windows": {
-        "command": "msbuild"
-    },
-    "linux": {
-        "command": "xbuild"
-    },
-    "args": [
-        // Ask msbuild to generate full paths for file names.
-        "/property:GenerateFullPaths=true"
-    ],
    "taskSelector": "/t:",
-    "showOutput": "silent",
    "tasks": [
        {
            "taskName": "build",
-            // Show the output window only if unrecognized errors occur.
+            "isShellCommand": true,
            "showOutput": "silent",
+            "command": "xbuild",
+            "windows": {
+                "command": "msbuild"
+            },
+            "args": [
+                // Ask msbuild to generate full paths for file names.
+                "/property:GenerateFullPaths=true"
+            ],
            // Use the standard MS compiler pattern to detect errors, warnings and infos
-            "problemMatcher": "$msCompile"
+            "problemMatcher": "$msCompile",
+            "isBuildCommand": true
        }
    ]
 }
@@ -10,7 +10,7 @@ install:
  - cmd: git submodule update --init --recursive
  - cmd: choco install resharper-clt -y
  - cmd: choco install nvika -y
-  - cmd: appveyor DownloadFile https://github.com/peppy/CodeFileSanity/releases/download/v0.1/CodeFileSanity.exe
+  - cmd: appveyor DownloadFile https://github.com/peppy/CodeFileSanity/releases/download/v0.2.2/CodeFileSanity.exe
 before_build:
  - cmd: CodeFileSanity.exe
  - cmd: nuget restore
@@ -21,4 +21,16 @@ Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/maste
  <startup>
    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
  </startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="DeltaCompressionDotNet.MsDelta" publicKeyToken="46b2138a390abf55" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.1.0.0" newVersion="1.1.0.0" />
+      </dependentAssembly>
+      <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>
@@ -4,7 +4,7 @@
 using System.Reflection;
 using System.Runtime.InteropServices;

-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("osu.Desktop.Deploy")]
@@ -16,8 +16,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]

@@ -27,11 +27,11 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
-// You can specify all the values or you can default the Build and Revision Numbers 
+// You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
@@ -68,9 +68,8 @@
      <HintPath>$(SolutionDir)\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.Rocks.dll</HintPath>
      <Private>True</Private>
    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
+    <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="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>
@@ -120,7 +119,7 @@
    </ProjectReference>
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
       Other similar extension points exist, see Microsoft.Common.targets.
  <Target Name="BeforeBuild">
  </Target>
@@ -6,7 +6,7 @@ Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/maste
 <packages>
  <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="9.0.1" 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="Splat" version="2.0.0" targetFramework="net452" />
  <package id="squirrel.windows" version="1.5.2" targetFramework="net452" />
@@ -33,18 +33,17 @@
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="mscorlib" />
-    <Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll</HintPath>
-      <Private>True</Private>
+    <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>
    <Reference Include="SQLite.Net, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>$(SolutionDir)\packages\SQLite.Net.Core-PCL.3.1.1\lib\portable-win8+net45+wp8+wpa81+MonoAndroid1+MonoTouch1\SQLite.Net.dll</HintPath>
    </Reference>
    <Reference Include="System" />
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>$(SolutionDir)\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
    <Reference Include="SQLiteNetExtensions">
      <HintPath>$(SolutionDir)\packages\SQLiteNetExtensions.1.3.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\SQLiteNetExtensions.dll</HintPath>
    </Reference>
@@ -1,12 +1,11 @@
 <?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="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
-  <package id="NUnit" version="3.5.0" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="10.0.2" targetFramework="net45" />
+  <package id="NUnit" version="3.6.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" />
@@ -16,7 +16,7 @@ namespace osu.Desktop.VisualTests.Beatmaps
        }

        private readonly Beatmap beatmap;
-        
+
        protected override Beatmap GetBeatmap() => beatmap;
        protected override Texture GetBackground() => null;
        protected override Track GetTrack() => null;
@@ -15,7 +15,7 @@ namespace osu.Desktop.VisualTests.Platform
        public TestStorage(string baseName) : base(baseName)
        {
        }
-        
+
        public override SQLiteConnection GetDatabase(string name)
        {
            ISQLitePlatform platform;
@@ -0,0 +1,65 @@
+// 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.Graphics;
+using osu.Framework.Graphics.Primitives;
+using osu.Framework.Testing;
+using osu.Game.Database;
+using osu.Game.Screens.Select;
+using System.Linq;
+
+namespace osu.Desktop.VisualTests.Tests
+{
+    internal class TestCaseBeatmapDetails : TestCase
+    {
+        public override string Description => "BeatmapDetails tab of BeatmapDetailArea";
+
+        private BeatmapDetails details;
+
+        public override void Reset()
+        {
+            base.Reset();
+
+            Add(details = new BeatmapDetails
+            {
+                RelativeSizeAxes = Axes.Both,
+                Padding = new MarginPadding(150),
+                Beatmap = new BeatmapInfo
+                {
+                    Version = "VisualTest",
+                    Metadata = new BeatmapMetadata
+                    {
+                        Source = "Some guy",
+                        Tags = "beatmap metadata example with a very very long list of tags and not much creativity",
+                    },
+                    Difficulty = new BeatmapDifficulty
+                    {
+                        CircleSize = 7,
+                        ApproachRate = 3.5f,
+                        OverallDifficulty = 5.7f,
+                        DrainRate = 1,
+                    },
+                    StarDifficulty = 5.3f,
+                    Metrics = new BeatmapMetrics
+                    {
+                        Ratings = Enumerable.Range(0,10),
+                        Fails = Enumerable.Range(lastRange, 100).Select(i => i % 12 - 6),
+                        Retries = Enumerable.Range(lastRange - 3, 100).Select(i => i % 12 - 6),
+                    },
+                },
+            });
+
+            AddRepeatStep("fail values", newRetryAndFailValues, 10);
+        }
+
+        private int lastRange = 1;
+
+        private void newRetryAndFailValues()
+        {
+            details.Beatmap.Metrics.Fails = Enumerable.Range(lastRange, 100).Select(i => i % 12 - 6);
+            details.Beatmap.Metrics.Retries = Enumerable.Range(lastRange - 3, 100).Select(i => i % 12 - 6);
+            details.Beatmap = details.Beatmap;
+            lastRange += 100;
+        }
+    }
+}
@@ -0,0 +1,42 @@
+// 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 osu.Framework.Graphics;
+using osu.Framework.Testing;
+using osu.Game.Graphics.UserInterface;
+using System.Linq;
+
+namespace osu.Desktop.VisualTests.Tests
+{
+    internal class TestCaseGraph : TestCase
+    {
+        public override string Description => "graph";
+
+        private BarGraph graph;
+
+        public override void Reset()
+        {
+            base.Reset();
+
+            Children = new[]
+            {
+                graph = new BarGraph
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Size = new Vector2(0.5f),
+                },
+            };
+
+            AddStep("values from 1-10", () => graph.Values = Enumerable.Range(1,10).Select(i => (float)i));
+            AddStep("values from 1-100", () => graph.Values = Enumerable.Range(1, 100).Select(i => (float)i));
+            AddStep("reversed values from 1-10", () => graph.Values = Enumerable.Range(1, 10).Reverse().Select(i => (float)i));
+            AddStep("Bottom to top", () => graph.Direction = BarDirection.BottomToTop);
+            AddStep("Top to bottom", () => graph.Direction = BarDirection.TopToBottom);
+            AddStep("Left to right", () => graph.Direction = BarDirection.LeftToRight);
+            AddStep("Right to left", () => graph.Direction = BarDirection.RightToLeft);
+        }
+    }
+}
@@ -99,6 +99,7 @@ namespace osu.Desktop.VisualTests.Tests

            AddToggleStep(@"auto", state => { auto = state; load(mode); });

+            BasicSliderBar<double> sliderBar;
            Add(new Container
            {
                Anchor = Anchor.TopRight,
@@ -107,16 +108,17 @@ namespace osu.Desktop.VisualTests.Tests
                Children = new Drawable[]
                {
                    new SpriteText { Text = "Playback Speed" },
-                    new BasicSliderBar<double>
+                    sliderBar = new BasicSliderBar<double>
                    {
                        Width = 150,
                        Height = 10,
                        SelectionColor = Color4.Orange,
-                        Value = playbackSpeed
                    }
                }
            });

+            sliderBar.Current.BindTo(playbackSpeed);
+
            framedClock.ProcessFrame();

            var clockAdjustContainer = new Container
@@ -44,6 +44,8 @@ namespace osu.Desktop.VisualTests.Tests
                kc.Add(new KeyCounterKeyboard(key));
            });

+            TestSliderBar<int> sliderBar;
+
            Add(new Container
            {
                Anchor = Anchor.TopRight,
@@ -52,16 +54,17 @@ namespace osu.Desktop.VisualTests.Tests
                Children = new Drawable[]
                {
                    new SpriteText { Text = "FadeTime" },
-                    new TestSliderBar<int>
+                    sliderBar =new TestSliderBar<int>
                    {
                        Width = 150,
                        Height = 10,
                        SelectionColor = Color4.Orange,
-                        Value = bindable
                    }
                }
            });

+            sliderBar.Current.BindTo(bindable);
+
            Add(kc);
        }
        private class TestSliderBar<T> : SliderBar<T> where T : struct
@@ -8,7 +8,7 @@ using osu.Game.Screens.Play;

 namespace osu.Desktop.VisualTests.Tests
 {
-    internal class TestCaseInGameOverlays : TestCase
+    internal class TestCaseMenuOverlays : TestCase
    {
        public override string Description => @"Tests pause and fail overlays";

@@ -20,23 +20,19 @@ namespace osu.Desktop.VisualTests.Tests
        {
            base.Reset();

-            pauseOverlay = new PauseOverlay
+            retryCount = 0;
+
+            Add(pauseOverlay = new PauseOverlay
            {
-                Depth = -1,
                OnResume = () => Logger.Log(@"Resume"),
                OnRetry = () => Logger.Log(@"Retry"),
                OnQuit = () => Logger.Log(@"Quit"),
-            };
-
-            failOverlay = new FailOverlay
+            });
+            Add(failOverlay = new FailOverlay
            {
-                Depth = -1,
                OnRetry = () => Logger.Log(@"Retry"),
                OnQuit = () => Logger.Log(@"Quit"),
-            };
-
-            Add(pauseOverlay);
-            Add(failOverlay);
+            });

            AddStep(@"Pause", delegate {
                if(failOverlay.State == Visibility.Visible)
@@ -58,8 +54,6 @@ namespace osu.Desktop.VisualTests.Tests
                pauseOverlay.Retries = retryCount;
                failOverlay.Retries = retryCount;
            });
-
-            retryCount = 0;
        }
    }
 }
@@ -30,7 +30,9 @@ namespace osu.Desktop.VisualTests.Tests
                Anchor = Anchor.Centre
            };
            Add(mc);
-            AddToggleStep(@"Show", state => mc.State = state ? Visibility.Visible : Visibility.Hidden);
+
+            AddToggleStep(@"toggle visibility", state => mc.State = state ? Visibility.Visible : Visibility.Hidden);
+            AddStep(@"show", () => mc.State = Visibility.Visible);
        }
    }
 }
@@ -83,10 +83,7 @@ namespace osu.Desktop.VisualTests.Tests
                Colour = Color4.Black,
            });

-            Add(new PlayerLoader(Player = CreatePlayer(beatmap))
-            {
-                Beatmap = beatmap
-            });
+            Add(Player = CreatePlayer(beatmap));
        }

        protected virtual Player CreatePlayer(WorkingBeatmap beatmap)
@@ -0,0 +1,49 @@
+// 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.Framework.Graphics;
+using osu.Framework.MathUtils;
+using osu.Framework.Testing;
+using osu.Framework.Timing;
+using osu.Game.Modes.Objects;
+using osu.Game.Screens.Play;
+
+namespace osu.Desktop.VisualTests.Tests
+{
+    internal class TestCaseSongProgress : TestCase
+    {
+        public override string Description => @"With fake data";
+
+        private SongProgress progress;
+
+        public override void Reset()
+        {
+            base.Reset();
+
+            Add(progress = new SongProgress
+            {
+                AudioClock = new StopwatchClock(true),
+                Anchor = Anchor.BottomLeft,
+                Origin = Anchor.BottomLeft,
+            });
+
+            AddStep("Toggle Bar", progress.ToggleBar);
+            AddWaitStep(5);
+            AddStep("Toggle Bar", progress.ToggleBar);
+            AddWaitStep(2);
+            AddRepeatStep("New Values", displayNewValues, 5);
+
+            displayNewValues();
+        }
+
+        private void displayNewValues()
+        {
+            List<HitObject> objects = new List<HitObject>();
+            for (double i = 0; i < 5000; i += RNG.NextDouble() * 10 + i / 1000)
+                objects.Add(new HitObject { StartTime = i });
+
+            progress.Objects = objects;
+        }
+    }
+}
@@ -36,7 +36,7 @@ namespace osu.Desktop.VisualTests.Tests
            filter.PinItem(GroupMode.All);
            filter.PinItem(GroupMode.RecentlyPlayed);

-            filter.SelectedItem.ValueChanged += newFilter =>
+            filter.Current.ValueChanged += newFilter =>
            {
                text.Text = "Currently Selected: " + newFilter.ToString();
            };
@@ -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 OpenTK;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.MathUtils;
@@ -11,20 +12,22 @@ using osu.Game.Modes.Taiko.Judgements;
 using osu.Game.Modes.Taiko.Objects;
 using osu.Game.Modes.Taiko.Objects.Drawables;
 using osu.Game.Modes.Taiko.UI;
+using System;

 namespace osu.Desktop.VisualTests.Tests
 {
    internal class TestCaseTaikoPlayfield : TestCase
    {
-        public override string Description => "Taiko playfield";
+        private const double default_duration = 300;
+        private const float scroll_time = 1000;

-        private TaikoPlayfield playfield;
+        public override string Description => "Taiko playfield";

        protected override double TimePerAction => default_duration * 2;

-        private const double default_duration = 300;
-
-        private const float scroll_time = 1000;
+        private readonly Random rng = new Random(1337);
+        private TaikoPlayfield playfield;
+        private Container playfieldContainer;

        public override void Reset()
        {
@@ -41,15 +44,22 @@ namespace osu.Desktop.VisualTests.Tests
            AddStep("Strong Rim", () => addRimHit(true));
            AddStep("Add bar line", () => addBarLine(false));
            AddStep("Add major bar line", () => addBarLine(true));
-
+            AddStep("Height test 1", () => changePlayfieldSize(1));
+            AddStep("Height test 2", () => changePlayfieldSize(2));
+            AddStep("Height test 3", () => changePlayfieldSize(3));
+            AddStep("Height test 4", () => changePlayfieldSize(4));
+            AddStep("Height test 5", () => changePlayfieldSize(5));
+            AddStep("Reset height", () => changePlayfieldSize(6));

            var rateAdjustClock = new StopwatchClock(true) { Rate = 1 };

-            Add(new Container
+            Add(playfieldContainer = new Container
            {
-                Clock = new FramedClock(rateAdjustClock),
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
                RelativeSizeAxes = Axes.X,
-                Y = 200,
+                Height = TaikoPlayfield.DEFAULT_PLAYFIELD_HEIGHT,
+                Clock = new FramedClock(rateAdjustClock),
                Children = new[]
                {
                    playfield = new TaikoPlayfield()
@@ -57,21 +67,63 @@ namespace osu.Desktop.VisualTests.Tests
            });
        }

+        private void changePlayfieldSize(int step)
+        {
+            // Add new hits
+            switch (step)
+            {
+                case 1:
+                    addCentreHit(false);
+                    break;
+                case 2:
+                    addCentreHit(true);
+                    break;
+                case 3:
+                    addDrumRoll(false);
+                    break;
+                case 4:
+                    addDrumRoll(true);
+                    break;
+                case 5:
+                    addSwell(1000);
+                    playfieldContainer.Delay(scroll_time - 100);
+                    break;
+            }
+
+            // Tween playfield height
+            switch (step)
+            {
+                default:
+                    playfieldContainer.ResizeTo(new Vector2(1, rng.Next(25, 400)), 500);
+                    break;
+                case 6:
+                    playfieldContainer.ResizeTo(new Vector2(1, TaikoPlayfield.DEFAULT_PLAYFIELD_HEIGHT), 500);
+                    break;
+            }
+        }
+
        private void addHitJudgement()
        {
            TaikoHitResult hitResult = RNG.Next(2) == 0 ? TaikoHitResult.Good : TaikoHitResult.Great;

-            playfield.OnJudgement(new DrawableTestHit(new Hit())
+            var h = new DrawableTestHit(new Hit())
            {
                X = RNG.NextSingle(hitResult == TaikoHitResult.Good ? -0.1f : -0.05f, hitResult == TaikoHitResult.Good ? 0.1f : 0.05f),
                Judgement = new TaikoJudgement
                {
                    Result = HitResult.Hit,
                    TaikoResult = hitResult,
-                    TimeOffset = 0,
-                    SecondHit = RNG.Next(10) == 0
+                    TimeOffset = 0
                }
-            });
+            };
+
+            playfield.OnJudgement(h);
+
+            if (RNG.Next(10) == 0)
+            {
+                h.Judgement.SecondHit = true;
+                playfield.OnJudgement(h);
+            }
        }

        private void addMissJudgement()
@@ -106,7 +158,7 @@ namespace osu.Desktop.VisualTests.Tests
                ScrollTime = scroll_time
            }));
        }
-        
+
        private void addDrumRoll(bool strong, double duration = default_duration)
        {
            addBarLine(true);
@@ -83,22 +83,20 @@
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="mscorlib" />
-    <Reference Include="OpenTK, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.2.0.50727.1340\lib\net45\OpenTK.dll</HintPath>
-      <Private>True</Private>
+    <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="SharpCompress, Version=0.15.1.0, Culture=neutral, PublicKeyToken=afb0a02973931d96, processorArchitecture=MSIL">
-      <HintPath>..\packages\SharpCompress.0.15.1\lib\net45\SharpCompress.dll</HintPath>
-      <Private>True</Private>
+    <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>
+    <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>
    <Reference Include="SQLite.Net, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>$(SolutionDir)\packages\SQLite.Net.Core-PCL.3.1.1\lib\portable-win8+net45+wp8+wpa81+MonoAndroid1+MonoTouch1\SQLite.Net.dll</HintPath>
    </Reference>
    <Reference Include="System" />
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>$(SolutionDir)\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
    <Reference Include="SQLiteNetExtensions">
      <HintPath>$(SolutionDir)\packages\SQLiteNetExtensions.1.3.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\SQLiteNetExtensions.dll</HintPath>
    </Reference>
@@ -187,9 +185,11 @@
    <Compile Include="AutomatedVisualTestGame.cs" />
    <Compile Include="Program.cs" />
    <Compile Include="Tests\TestCaseChatDisplay.cs" />
+    <Compile Include="Tests\TestCaseBeatmapDetails.cs" />
    <Compile Include="Tests\TestCaseDrawings.cs" />
    <Compile Include="Tests\TestCaseGamefield.cs" />
-    <Compile Include="Tests\TestCaseInGameOverlays.cs" />
+    <Compile Include="Tests\TestCaseGraph.cs" />
+    <Compile Include="Tests\TestCaseMenuOverlays.cs" />
    <Compile Include="Tests\TestCaseMusicController.cs" />
    <Compile Include="Tests\TestCaseNotificationManager.cs" />
    <Compile Include="Tests\TestCasePlayer.cs" />
@@ -207,6 +207,7 @@
    <Compile Include="VisualTestGame.cs" />
    <Compile Include="Platform\TestStorage.cs" />
    <Compile Include="Tests\TestCaseOptions.cs" />
+    <Compile Include="Tests\TestCaseSongProgress.cs" />
    <Compile Include="Tests\TestCaseModSelectOverlay.cs" />
    <Compile Include="Tests\TestCaseDialogOverlay.cs" />
    <Compile Include="Tests\TestCaseBeatmapOptionsOverlay.cs" />
@@ -4,9 +4,9 @@ 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="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
-  <package id="ppy.OpenTK" version="2.0.50727.1340" targetFramework="net45" />
-  <package id="SharpCompress" version="0.15.1" targetFramework="net45" />
+  <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="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" />
@@ -189,19 +189,24 @@ namespace osu.Desktop.Overlays

        private class UpdateProgressNotification : ProgressNotification
        {
+            private OsuGame game;
+
            protected override Notification CreateCompletionNotification() => new ProgressCompletionNotification()
            {
                Text = @"Update ready to install. Click to restart!",
                Activated = () =>
                {
-                    UpdateManager.RestartApp();
+                    UpdateManager.RestartAppWhenExited();
+                    game.GracefullyExit();
                    return true;
                }
            };

            [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
+            private void load(OsuColour colours, OsuGame game)
            {
+                this.game = game;
+
                IconContent.Add(new Drawable[]
                {
                    new Box
@@ -4,7 +4,7 @@
 using System.Reflection;
 using System.Runtime.InteropServices;

-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("osu!lazer")]
@@ -16,8 +16,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]

@@ -124,8 +124,7 @@
      <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.1340\lib\net45\OpenTK.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.2.0.50727.1341\lib\net45\OpenTK.dll</HintPath>
    </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>
@@ -7,7 +7,7 @@ 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.1340" targetFramework="net45" />
+  <package id="ppy.OpenTK" version="2.0.50727.1341" targetFramework="net45" />
  <package id="Splat" version="2.0.0" targetFramework="net45" />
  <package id="squirrel.windows" version="1.5.2" targetFramework="net45" />
 </packages>
@@ -4,7 +4,7 @@
 using System.Reflection;
 using System.Runtime.InteropServices;

-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("osu.Game.Modes.Catch")]
@@ -16,8 +16,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]

@@ -27,11 +27,11 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
-// You can specify all the values or you can default the Build and Revision Numbers 
+// You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
@@ -14,8 +14,7 @@ namespace osu.Game.Modes.Catch.UI
    {
        public CatchPlayfield()
        {
-            RelativeSizeAxes = Axes.Y;
-            Size = new Vector2(512, 0.9f);
+            Size = new Vector2(1, 0.9f);
            Anchor = Anchor.BottomCentre;
            Origin = Anchor.BottomCentre;

@@ -33,8 +33,7 @@
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="OpenTK, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.2.0.50727.1340\lib\net45\OpenTK.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.2.0.50727.1341\lib\net45\OpenTK.dll</HintPath>
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Core" />
@@ -84,7 +83,7 @@
    </ProjectReference>
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
       Other similar extension points exist, see Microsoft.Common.targets.
  <Target Name="BeforeBuild">
  </Target>
@@ -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.1340" targetFramework="net45" />
+  <package id="ppy.OpenTK" version="2.0.50727.1341" targetFramework="net45" />
 </packages>
@@ -4,7 +4,7 @@
 using System.Reflection;
 using System.Runtime.InteropServices;

-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("osu.Game.Modes.Mania")]
@@ -16,8 +16,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]

@@ -27,11 +27,11 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
-// You can specify all the values or you can default the Build and Revision Numbers 
+// You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
@@ -15,8 +15,7 @@ namespace osu.Game.Modes.Mania.UI
    {
        public ManiaPlayfield(int columns)
        {
-            RelativeSizeAxes = Axes.Both;
-            Size = new Vector2(columns / 20f, 1f);
+            Size = new Vector2(0.8f, 1f);
            Anchor = Anchor.BottomCentre;
            Origin = Anchor.BottomCentre;

@@ -33,8 +33,7 @@
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="OpenTK, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.2.0.50727.1340\lib\net45\OpenTK.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.2.0.50727.1341\lib\net45\OpenTK.dll</HintPath>
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Core" />
@@ -89,7 +88,7 @@
  </ItemGroup>
  <ItemGroup />
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
       Other similar extension points exist, see Microsoft.Common.targets.
  <Target Name="BeforeBuild">
  </Target>
@@ -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.1340" targetFramework="net45" />
+  <package id="ppy.OpenTK" version="2.0.50727.1341" targetFramework="net45" />
 </packages>
@@ -32,7 +32,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Connections
                Colour = Color4.White.Opacity(0.2f),
                Radius = 4,
            };
-            
+
            Children = new Drawable[]
            {
                new Box
@@ -57,7 +57,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
                Judgement.Score = Tracking ? OsuScoreResult.SliderTick : OsuScoreResult.Miss;
            }
        }
-        
+
        protected override void UpdatePreemptState()
        {
            var animIn = Math.Min(150, sliderTick.StartTime - FadeInTime);
@@ -42,14 +42,14 @@ namespace osu.Game.Modes.Osu
            {
                if (mouseDisabled.Value)
                {
-                    mouse.PressedButtons.Remove(MouseButton.Left);
-                    mouse.PressedButtons.Remove(MouseButton.Right);
+                    mouse.SetPressed(MouseButton.Left, false);
+                    mouse.SetPressed(MouseButton.Right, false);
                }

                if (leftViaKeyboard)
-                    mouse.PressedButtons.Add(MouseButton.Left);
+                    mouse.SetPressed(MouseButton.Left, true);
                if (rightViaKeyboard)
-                    mouse.PressedButtons.Add(MouseButton.Right);
+                    mouse.SetPressed(MouseButton.Right, true);
            }
        }
    }
@@ -4,7 +4,7 @@
 using System.Reflection;
 using System.Runtime.InteropServices;

-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("osu.Game.Mode.Osu")]
@@ -16,8 +16,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]

@@ -27,11 +27,11 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
-// You can specify all the values or you can default the Build and Revision Numbers 
+// You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
@@ -35,11 +35,9 @@ namespace osu.Game.Modes.Osu.Scoring
                switch (judgement.Result)
                {
                    case HitResult.Hit:
-                        Combo.Value++;
                        Health.Value += 0.1f;
                        break;
                    case HitResult.Miss:
-                        Combo.Value = 0;
                        Health.Value -= 0.2f;
                        break;
                }
@@ -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 OpenTK;
 using osu.Game.Beatmaps;
 using osu.Game.Modes.Objects.Drawables;
 using osu.Game.Modes.Osu.Beatmaps;
@@ -46,5 +47,7 @@ namespace osu.Game.Modes.Osu.UI
                return new DrawableSpinner(spinner);
            return null;
        }
+
+        protected override Vector2 GetPlayfieldAspectAdjust() => new Vector2(0.75f);
    }
 }
@@ -38,8 +38,6 @@ namespace osu.Game.Modes.Osu.UI
        {
            Anchor = Anchor.Centre;
            Origin = Anchor.Centre;
-            RelativeSizeAxes = Axes.Both;
-            Size = new Vector2(0.75f);

            Add(new Drawable[]
            {
@@ -34,8 +34,7 @@
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="OpenTK, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.2.0.50727.1340\lib\net45\OpenTK.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.2.0.50727.1341\lib\net45\OpenTK.dll</HintPath>
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Core" />
@@ -104,7 +103,7 @@
  </ItemGroup>
  <ItemGroup />
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
       Other similar extension points exist, see Microsoft.Common.targets.
  <Target Name="BeforeBuild">
  </Target>
@@ -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.1340" targetFramework="net45" />
+  <package id="ppy.OpenTK" version="2.0.50727.1341" targetFramework="net45" />
 </packages>
@@ -72,7 +72,7 @@ namespace osu.Game.Modes.Taiko.Beatmaps

                double speedAdjustment = beatmap.TimingInfo.SpeedMultiplierAt(obj.StartTime);
                double speedAdjustedBeatLength = beatmap.TimingInfo.BeatLengthAt(obj.StartTime) * speedAdjustment;
-                
+
                // The true distance, accounting for any repeats. This ends up being the drum roll distance later
                double distance = distanceData.Distance * repeats * legacy_velocity_multiplier;

@@ -6,6 +6,7 @@ using System.Linq;
 using osu.Framework.Graphics;
 using osu.Game.Modes.Objects.Drawables;
 using osu.Game.Modes.Taiko.Judgements;
+using osu.Game.Modes.Taiko.Objects.Drawables.Pieces;
 using OpenTK.Input;

 namespace osu.Game.Modes.Taiko.Objects.Drawables
@@ -66,6 +67,10 @@ namespace osu.Game.Modes.Taiko.Objects.Drawables
        {
            Delay(HitObject.StartTime - Time.Current + Judgement.TimeOffset, true);

+            var circlePiece = MainPiece as CirclePiece;
+
+            circlePiece?.FlashBox.Flush();
+
            switch (State)
            {
                case ArmedState.Idle:
@@ -77,6 +82,16 @@ namespace osu.Game.Modes.Taiko.Objects.Drawables
                case ArmedState.Hit:
                    FadeOut(600);

+                    var flash = circlePiece?.FlashBox;
+                    if (flash != null)
+                    {
+                        flash.FadeTo(0.9f);
+                        flash.FadeOut(300);
+                    }
+
+
+                    FadeOut(800);
+
                    const float gravity_time = 300;
                    const float gravity_travel_height = 200;

@@ -65,7 +65,7 @@ namespace osu.Game.Modes.Taiko.Objects.Drawables
                            Anchor = Anchor.Centre,
                            Origin = Anchor.Centre,
                            Alpha = 0,
-                            Size = new Vector2(TaikoHitObject.CIRCLE_RADIUS * 2),
+                            Size = new Vector2(TaikoHitObject.DEFAULT_CIRCLE_DIAMETER),
                            BlendingMode = BlendingMode.Additive,
                            Masking = true,
                            Children = new []
@@ -82,7 +82,7 @@ namespace osu.Game.Modes.Taiko.Objects.Drawables
                            Name = "Target ring (thick border)",
                            Anchor = Anchor.Centre,
                            Origin = Anchor.Centre,
-                            Size = new Vector2(TaikoHitObject.CIRCLE_RADIUS * 2),
+                            Size = new Vector2(TaikoHitObject.DEFAULT_CIRCLE_DIAMETER),
                            Masking = true,
                            BorderThickness = target_ring_thick_border,
                            BlendingMode = BlendingMode.Additive,
@@ -19,15 +19,10 @@ namespace osu.Game.Modes.Taiko.Objects.Drawables.Pieces
    /// </summary>
    public class CirclePiece : TaikoPiece
    {
-        public const float SYMBOL_SIZE = TaikoHitObject.CIRCLE_RADIUS * 2f * 0.45f;
+        public const float SYMBOL_SIZE = TaikoHitObject.DEFAULT_CIRCLE_DIAMETER * 0.45f;
        public const float SYMBOL_BORDER = 8;
        public const float SYMBOL_INNER_SIZE = SYMBOL_SIZE - 2 * SYMBOL_BORDER;

-        /// <summary>
-        /// The amount to scale up the base circle to show it as a "strong" piece.
-        /// </summary>
-        private const float strong_scale = 1.5f;
-
        /// <summary>
        /// The colour of the inner circle and outer glows.
        /// </summary>
@@ -64,6 +59,8 @@ namespace osu.Game.Modes.Taiko.Objects.Drawables.Pieces

        private readonly Container background;

+        public Box FlashBox;
+
        public CirclePiece(bool isStrong = false)
        {
            AddInternal(new Drawable[]
@@ -104,11 +101,13 @@ namespace osu.Game.Modes.Taiko.Objects.Drawables.Pieces
                    Masking = true,
                    Children = new[]
                    {
-                        new Box
+                        FlashBox = new Box
                        {
                            Anchor = Anchor.Centre,
                            Origin = Anchor.Centre,
                            RelativeSizeAxes = Axes.Both,
+                            Colour = Color4.White,
+                            BlendingMode = BlendingMode.Additive,
                            Alpha = 0,
                            AlwaysPresent = true
                        }
@@ -125,10 +124,10 @@ namespace osu.Game.Modes.Taiko.Objects.Drawables.Pieces

            if (isStrong)
            {
-                Size *= strong_scale;
+                Size *= TaikoHitObject.STRONG_CIRCLE_DIAMETER_SCALE;

                //default for symbols etc.
-                Content.Scale *= strong_scale;
+                Content.Scale *= TaikoHitObject.STRONG_CIRCLE_DIAMETER_SCALE;
            }
        }

@@ -39,7 +39,7 @@ namespace osu.Game.Modes.Taiko.Objects.Drawables.Pieces
        public TaikoPiece()
        {
            //just a default
-            Size = new Vector2(TaikoHitObject.CIRCLE_RADIUS * 2);
+            Size = new Vector2(TaikoHitObject.DEFAULT_CIRCLE_DIAMETER);
        }
    }
 }
@@ -15,12 +15,12 @@ namespace osu.Game.Modes.Taiko.Objects.Drawables.Pieces
        /// Any tick that is not the first for a drumroll is not filled, but is instead displayed
        /// as a hollow circle. This is what controls the border width of that circle.
        /// </summary>
-        private const float tick_border_width = TaikoHitObject.CIRCLE_RADIUS / 2 / 4;
+        private const float tick_border_width = TaikoHitObject.DEFAULT_CIRCLE_DIAMETER / 16;

        /// <summary>
        /// The size of a tick.
        /// </summary>
-        private const float tick_size = TaikoHitObject.CIRCLE_RADIUS / 2;
+        private const float tick_size = TaikoHitObject.DEFAULT_CIRCLE_DIAMETER / 4;

        private bool filled;
        public bool Filled
@@ -4,15 +4,31 @@
 using osu.Game.Beatmaps.Timing;
 using osu.Game.Database;
 using osu.Game.Modes.Objects;
+using osu.Game.Modes.Taiko.UI;

 namespace osu.Game.Modes.Taiko.Objects
 {
    public abstract class TaikoHitObject : HitObject
    {
        /// <summary>
-        /// HitCircle radius.
+        /// Diameter of a circle relative to the size of the <see cref="TaikoPlayfield"/>.
        /// </summary>
-        public const float CIRCLE_RADIUS = 42f;
+        public const float PLAYFIELD_RELATIVE_DIAMETER = 0.5f;
+
+        /// <summary>
+        /// Scale multiplier for a strong circle.
+        /// </summary>
+        public const float STRONG_CIRCLE_DIAMETER_SCALE = 1.5f;
+
+        /// <summary>
+        /// Default circle diameter.
+        /// </summary>
+        public const float DEFAULT_CIRCLE_DIAMETER = TaikoPlayfield.DEFAULT_PLAYFIELD_HEIGHT * PLAYFIELD_RELATIVE_DIAMETER;
+
+        /// <summary>
+        /// Default strong circle diameter.
+        /// </summary>
+        public const float DEFAULT_STRONG_CIRCLE_DIAMETER = DEFAULT_CIRCLE_DIAMETER * STRONG_CIRCLE_DIAMETER_SCALE;

        /// <summary>
        /// The time taken from the initial (off-screen) spawn position to the centre of the hit target for a <see cref="ControlPoint.BeatLength"/> of 1000ms.
@@ -4,7 +4,7 @@
 using System.Reflection;
 using System.Runtime.InteropServices;

-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("osu.Game.Modes.Taiko")]
@@ -16,8 +16,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]

@@ -27,11 +27,11 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
-// You can specify all the values or you can default the Build and Revision Numbers 
+// You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
@@ -18,11 +18,6 @@ namespace osu.Game.Modes.Taiko.UI
    /// </summary>
    internal class HitExplosion : CircularContainer
    {
-        /// <summary>
-        /// The size multiplier of a hit explosion if a hit object has been hit with the second key.
-        /// </summary>
-        private const float secondhit_size_multiplier = 1.5f;
-
        /// <summary>
        /// The judgement this hit explosion visualises.
        /// </summary>
@@ -34,7 +29,7 @@ namespace osu.Game.Modes.Taiko.UI
        {
            Judgement = judgement;

-            Size = new Vector2(TaikoHitObject.CIRCLE_RADIUS * 2);
+            Size = new Vector2(TaikoHitObject.DEFAULT_CIRCLE_DIAMETER);

            Anchor = Anchor.Centre;
            Origin = Anchor.Centre;
@@ -85,7 +80,7 @@ namespace osu.Game.Modes.Taiko.UI
        /// </summary>
        public void VisualiseSecondHit()
        {
-            ResizeTo(Size * secondhit_size_multiplier, 50);
+            ResizeTo(Size * TaikoHitObject.STRONG_CIRCLE_DIAMETER_SCALE, 50);
        }
    }
 }
@@ -15,16 +15,6 @@ namespace osu.Game.Modes.Taiko.UI
    /// </summary>
    internal class HitTarget : Container
    {
-        /// <summary>
-        /// Diameter of normal hit object circles.
-        /// </summary>
-        private const float normal_diameter = TaikoHitObject.CIRCLE_RADIUS * 2;
-        
-        /// <summary>
-        /// Diameter of strong hit object circles.
-        /// </summary>
-        private const float strong_hit_diameter = normal_diameter * 1.5f;
-
        /// <summary>
        /// The 1px inner border of the taiko playfield.
        /// </summary>
@@ -37,7 +27,7 @@ namespace osu.Game.Modes.Taiko.UI

        public HitTarget()
        {
-            RelativeSizeAxes = Axes.Y;
+            Size = new Vector2(TaikoPlayfield.DEFAULT_PLAYFIELD_HEIGHT);

            Children = new Drawable[]
            {
@@ -47,7 +37,7 @@ namespace osu.Game.Modes.Taiko.UI
                    Anchor = Anchor.TopCentre,
                    Origin = Anchor.TopCentre,
                    Y = border_offset,
-                    Size = new Vector2(border_thickness, (TaikoPlayfield.PLAYFIELD_HEIGHT - strong_hit_diameter) / 2f - border_offset),
+                    Size = new Vector2(border_thickness, (TaikoPlayfield.DEFAULT_PLAYFIELD_HEIGHT - TaikoHitObject.DEFAULT_STRONG_CIRCLE_DIAMETER) / 2f - border_offset),
                    Alpha = 0.1f
                },
                new CircularContainer
@@ -55,7 +45,7 @@ namespace osu.Game.Modes.Taiko.UI
                    Name = "Strong Hit Ring",
                    Anchor = Anchor.Centre,
                    Origin = Anchor.Centre,
-                    Size = new Vector2(strong_hit_diameter),
+                    Size = new Vector2(TaikoHitObject.DEFAULT_STRONG_CIRCLE_DIAMETER),
                    Masking = true,
                    BorderColour = Color4.White,
                    BorderThickness = border_thickness,
@@ -75,7 +65,7 @@ namespace osu.Game.Modes.Taiko.UI
                    Name = "Normal Hit Ring",
                    Anchor = Anchor.Centre,
                    Origin = Anchor.Centre,
-                    Size = new Vector2(normal_diameter),
+                    Size = new Vector2(TaikoHitObject.DEFAULT_CIRCLE_DIAMETER),
                    Masking = true,
                    BorderColour = Color4.White,
                    BorderThickness = border_thickness,
@@ -96,7 +86,7 @@ namespace osu.Game.Modes.Taiko.UI
                    Anchor = Anchor.BottomCentre,
                    Origin = Anchor.BottomCentre,
                    Y = -border_offset,
-                    Size = new Vector2(border_thickness, (TaikoPlayfield.PLAYFIELD_HEIGHT - strong_hit_diameter) / 2f - border_offset),
+                    Size = new Vector2(border_thickness, (TaikoPlayfield.DEFAULT_PLAYFIELD_HEIGHT - TaikoHitObject.DEFAULT_STRONG_CIRCLE_DIAMETER) / 2f - border_offset),
                    Alpha = 0.1f
                },
            };
@@ -21,7 +21,7 @@ namespace osu.Game.Modes.Taiko.UI
    {
        public InputDrum()
        {
-            Size = new Vector2(TaikoPlayfield.PLAYFIELD_HEIGHT);
+            Size = new Vector2(TaikoPlayfield.DEFAULT_PLAYFIELD_HEIGHT);

            const float middle_split = 10;

@@ -60,7 +60,7 @@ namespace osu.Game.Modes.Taiko.UI
            /// The key to be used for the rim of the half-drum.
            /// </summary>
            public Key RimKey;
-            
+
            /// <summary>
            /// The key to be used for the centre of the half-drum.
            /// </summary>
@@ -17,6 +17,7 @@ using osu.Game.Modes.Taiko.Objects.Drawables;
 using osu.Game.Modes.Taiko.Scoring;
 using osu.Game.Modes.UI;
 using osu.Game.Modes.Taiko.Replays;
+using OpenTK;

 namespace osu.Game.Modes.Taiko.UI
 {
@@ -100,6 +101,17 @@ namespace osu.Game.Modes.Taiko.UI
            }
        }

+        protected override Vector2 GetPlayfieldAspectAdjust()
+        {
+            const float default_relative_height = TaikoPlayfield.DEFAULT_PLAYFIELD_HEIGHT / 768;
+            const float default_aspect = 16f / 9f;
+
+            float aspectAdjust = MathHelper.Clamp(DrawWidth / DrawHeight, 0.4f, 4) / default_aspect;
+
+            return new Vector2(1, default_relative_height * aspectAdjust);
+        }
+
+
        public override ScoreProcessor CreateScoreProcessor() => new TaikoScoreProcessor(this);

        protected override IBeatmapConverter<TaikoHitObject> CreateBeatmapConverter() => new TaikoBeatmapConverter();
@@ -16,21 +16,21 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics.Primitives;
 using System.Linq;
 using osu.Game.Modes.Taiko.Objects.Drawables;
+using System;

 namespace osu.Game.Modes.Taiko.UI
 {
    public class TaikoPlayfield : Playfield<TaikoHitObject, TaikoJudgement>
    {
        /// <summary>
-        /// The play field height. This is relative to the size of hit objects
-        /// such that the playfield is just a bit larger than strong hits.
+        /// The default play field height.
        /// </summary>
-        public const float PLAYFIELD_HEIGHT = TaikoHitObject.CIRCLE_RADIUS * 2 * 2;
+        public const float DEFAULT_PLAYFIELD_HEIGHT = 168f;

        /// <summary>
        /// The offset from <see cref="left_area_size"/> which the center of the hit target lies at.
        /// </summary>
-        private const float hit_target_offset = TaikoHitObject.CIRCLE_RADIUS * 1.5f + 40;
+        private const float hit_target_offset = TaikoHitObject.DEFAULT_STRONG_CIRCLE_DIAMETER / 2f + 40;

        /// <summary>
        /// The size of the left area of the playfield. This area contains the input drum.
@@ -52,13 +52,11 @@ namespace osu.Game.Modes.Taiko.UI

        public TaikoPlayfield()
        {
-            RelativeSizeAxes = Axes.X;
-            Height = PLAYFIELD_HEIGHT;
-
            AddInternal(new Drawable[]
            {
                rightBackgroundContainer = new Container
                {
+                    Name = "Transparent playfield background",
                    RelativeSizeAxes = Axes.Both,
                    BorderThickness = 2,
                    Masking = true,
@@ -77,76 +75,88 @@ namespace osu.Game.Modes.Taiko.UI
                        },
                    }
                },
-                new Container
+                new ScaleFixContainer
                {
-                    RelativeSizeAxes = Axes.Both,
-                    Padding = new MarginPadding { Left = left_area_size },
-                    Children = new Drawable[]
+                    RelativeSizeAxes = Axes.X,
+                    Height = DEFAULT_PLAYFIELD_HEIGHT,
+                    Children = new[]
                    {
                        new Container
                        {
-                            X = hit_target_offset,
+                            Name = "Transparent playfield elements",
                            RelativeSizeAxes = Axes.Both,
+                            Padding = new MarginPadding { Left = left_area_size },
                            Children = new Drawable[]
                            {
-                                hitExplosionContainer = new Container<HitExplosion>
+                                new Container
                                {
-                                    Anchor = Anchor.CentreLeft,
+                                    Name = "Hit target container",
+                                    X = hit_target_offset,
+                                    RelativeSizeAxes = Axes.Both,
+                                    Children = new Drawable[]
+                                    {
+                                        hitExplosionContainer = new Container<HitExplosion>
+                                        {
+                                            Anchor = Anchor.CentreLeft,
+                                            Origin = Anchor.Centre,
+                                            RelativeSizeAxes = Axes.Y,
+                                            BlendingMode = BlendingMode.Additive
+                                        },
+                                        barLineContainer = new Container<DrawableBarLine>
+                                        {
+                                            RelativeSizeAxes = Axes.Both,
+                                        },
+                                        new HitTarget
+                                        {
+                                            Anchor = Anchor.CentreLeft,
+                                            Origin = Anchor.Centre,
+                                        },
+                                        hitObjectContainer = new Container
+                                        {
+                                            RelativeSizeAxes = Axes.Both,
+                                        },
+                                        judgementContainer = new Container<DrawableTaikoJudgement>
+                                        {
+                                            RelativeSizeAxes = Axes.Y,
+                                            BlendingMode = BlendingMode.Additive
+                                        },
+                                    },
+                                },
+                            }
+                        },
+                        leftBackgroundContainer = new Container
+                        {
+                            Name = "Left overlay",
+                            Size = new Vector2(left_area_size, DEFAULT_PLAYFIELD_HEIGHT),
+                            BorderThickness = 1,
+                            Children = new Drawable[]
+                            {
+                                leftBackground = new Box
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                },
+                                new InputDrum
+                                {
+                                    Anchor = Anchor.Centre,
                                    Origin = Anchor.Centre,
-                                    Size = new Vector2(TaikoHitObject.CIRCLE_RADIUS * 2),
-                                    BlendingMode = BlendingMode.Additive
+                                    RelativePositionAxes = Axes.X,
+                                    Position = new Vector2(0.10f, 0),
+                                    Scale = new Vector2(0.9f)
                                },
-                                barLineContainer = new Container<DrawableBarLine>
+                                new Box
                                {
-                                    RelativeSizeAxes = Axes.Both,
+                                    Anchor = Anchor.TopRight,
+                                    RelativeSizeAxes = Axes.Y,
+                                    Width = 10,
+                                    ColourInfo = Framework.Graphics.Colour.ColourInfo.GradientHorizontal(Color4.Black.Opacity(0.6f), Color4.Black.Opacity(0)),
                                },
-                                new HitTarget
-                                {
-                                    Anchor = Anchor.CentreLeft,
-                                    Origin = Anchor.Centre,
-                                },
-                                hitObjectContainer = new Container
-                                {
-                                    RelativeSizeAxes = Axes.Both,
-                                },
-                                judgementContainer = new Container<DrawableTaikoJudgement>
-                                {
-                                    RelativeSizeAxes = Axes.Both,
-                                    BlendingMode = BlendingMode.Additive
-                                },
-                            },
-                        },
-                    }
-                },
-                leftBackgroundContainer = new Container
-                {
-                    Size = new Vector2(left_area_size, PLAYFIELD_HEIGHT),
-                    BorderThickness = 1,
-                    Children = new Drawable[]
-                    {
-                        leftBackground = new Box
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                        },
-                        new InputDrum
-                        {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            RelativePositionAxes = Axes.X,
-                            Position = new Vector2(0.10f, 0),
-                            Scale = new Vector2(0.9f)
-                        },
-                        new Box
-                        {
-                            Anchor = Anchor.TopRight,
-                            RelativeSizeAxes = Axes.Y,
-                            Width = 10,
-                            ColourInfo = Framework.Graphics.Colour.ColourInfo.GradientHorizontal(Color4.Black.Opacity(0.6f), Color4.Black.Opacity(0)),
+                            }
                        },
                    }
                },
                topLevelHitContainer = new Container
                {
+                    Name = "Top level hit objects",
                    RelativeSizeAxes = Axes.Both,
                }
            });
@@ -208,5 +218,56 @@ namespace osu.Game.Modes.Taiko.UI
            else
                hitExplosionContainer.Children.FirstOrDefault(e => e.Judgement == judgedObject.Judgement)?.VisualiseSecondHit();
        }
+
+        /// <summary>
+        /// This is a very special type of container. It serves a similar purpose to <see cref="FillMode.Fit"/>, however unlike <see cref="FillMode.Fit"/>,
+        /// this will only adjust the scale relative to the height of its parent and will maintain the original width relative to its parent.
+        /// 
+        /// <para>
+        /// By adjusting the scale relative to the height of its parent, the aspect ratio of this container's children is maintained, however this is undesirable
+        /// in the case where the hit object container should not have its width adjusted by scale. To counteract this, another container is nested inside this
+        /// container which takes care of reversing the width adjustment while appearing transparent to the user.
+        /// </para>
+        /// </summary>
+        private class ScaleFixContainer : Container
+        {
+            protected override Container<Drawable> Content => widthAdjustmentContainer;
+            private readonly WidthAdjustmentContainer widthAdjustmentContainer;
+
+            /// <summary>
+            /// We only want to apply DrawScale in the Y-axis to preserve aspect ratio and <see cref="TaikoPlayfield"/> doesn't care about having its width adjusted.
+            /// </summary>
+            protected override Vector2 DrawScale => Scale * RelativeToAbsoluteFactor.Y / DrawHeight;
+
+            public ScaleFixContainer()
+            {
+                AddInternal(widthAdjustmentContainer = new WidthAdjustmentContainer { ParentDrawScaleReference = () => DrawScale.X });
+            }
+
+            /// <summary>
+            /// The container type that reverses the <see cref="Drawable.DrawScale"/> width adjustment.
+            /// </summary>
+            private class WidthAdjustmentContainer : Container
+            {
+                /// <summary>
+                /// This container needs to know its parent's <see cref="Drawable.DrawScale"/> so it can reverse the width adjustment caused by <see cref="Drawable.DrawScale"/>.
+                /// </summary>
+                public Func<float> ParentDrawScaleReference;
+
+                public WidthAdjustmentContainer()
+                {
+                    // This container doesn't care about height, it should always fill its parent
+                    RelativeSizeAxes = Axes.Y;
+                }
+
+                protected override void Update()
+                {
+                    base.Update();
+
+                    // Reverse the DrawScale adjustment
+                    Width = Parent.DrawSize.X / ParentDrawScaleReference();
+                }
+            }
+        }
    }
 }
@@ -33,8 +33,7 @@
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="OpenTK, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.2.0.50727.1340\lib\net45\OpenTK.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.2.0.50727.1341\lib\net45\OpenTK.dll</HintPath>
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Core" />
@@ -112,7 +111,7 @@
    </ProjectReference>
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
       Other similar extension points exist, see Microsoft.Common.targets.
  <Target Name="BeforeBuild">
  </Target>
@@ -4,5 +4,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.1340" targetFramework="net45" />
+  <package id="ppy.OpenTK" version="2.0.50727.1341" targetFramework="net45" />
 </packages>
@@ -97,7 +97,7 @@ namespace osu.Game.Tests.Beatmaps.IO
                ensureLoaded(osu);

                Assert.IsTrue(File.Exists(temp));
-                
+
                File.Delete(temp);

                Assert.IsFalse(File.Exists(temp));
@@ -29,13 +29,11 @@
    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll</HintPath>
-      <Private>True</Private>
+    <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>
    <Reference Include="OpenTK, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.2.0.50727.1340\lib\net45\OpenTK.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.2.0.50727.1341\lib\net45\OpenTK.dll</HintPath>
    </Reference>
    <Reference Include="System" />
    <Reference Include="SQLite.Net">
@@ -1,12 +1,11 @@
 <?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="NUnit" version="3.5.0" targetFramework="net45" />
-  <package id="ppy.OpenTK" version="2.0.50727.1340" targetFramework="net45" />
+  <package id="NUnit" version="3.6.1" targetFramework="net45" />
+  <package id="ppy.OpenTK" version="2.0.50727.1341" 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" />
 </packages>
@@ -69,7 +69,7 @@ namespace osu.Game.Beatmaps.Drawables
                GainedSelection = headerGainedSelection,
                RelativeSizeAxes = Axes.X,
            };
-            
+
            BeatmapSet.Beatmaps = BeatmapSet.Beatmaps.OrderBy(b => b.StarDifficulty).ToList();
            BeatmapPanels = BeatmapSet.Beatmaps.Select(b => new BeatmapPanel(b)
            {
@@ -40,7 +40,7 @@ namespace osu.Game.Beatmaps
        protected abstract Beatmap GetBeatmap();
        protected abstract Texture GetBackground();
        protected abstract Track GetTrack();
-        
+
        private Beatmap beatmap;
        private readonly object beatmapLock = new object();
        public Beatmap Beatmap
@@ -53,7 +53,7 @@ namespace osu.Game.Beatmaps
                }
            }
        }
-        
+
        private readonly object backgroundLock = new object();
        private Texture background;
        public Texture Background
@@ -87,7 +87,7 @@ namespace osu.Game.Beatmaps
            if (track != null && BeatmapInfo.AudioEquals(other.BeatmapInfo))
                other.track = track;
        }
-        
+
        public virtual void Dispose()
        {
            track?.Dispose();
@@ -13,7 +13,7 @@ namespace osu.Game.Configuration
        protected override void InitialiseDefaults()
        {
 #pragma warning disable CS0612 // Type or member is obsolete
-            
+
            Set(OsuConfig.Username, string.Empty);
            Set(OsuConfig.Token, string.Empty);

@@ -31,7 +31,7 @@ namespace osu.Game.Configuration
            Set(OsuConfig.MouseDisableWheel, false);

            Set(OsuConfig.SnakingInSliders, true);
-            Set(OsuConfig.SnakingOutSliders, false);
+            Set(OsuConfig.SnakingOutSliders, true);

            Set(OsuConfig.MenuParallax, true);

@@ -46,6 +46,7 @@ namespace osu.Game.Configuration
            Set(OsuConfig.AutomaticDownload, true).Disabled = true;
            Set(OsuConfig.AutomaticDownloadNoVideo, false).Disabled = true;
            Set(OsuConfig.BlockNonFriendPM, false).Disabled = true;
+            Set(OsuConfig.Bloom, false).Disabled = true;
            Set(OsuConfig.BloomSoftening, false).Disabled = true;
            Set(OsuConfig.BossKeyFirstActivation, true).Disabled = true;
            Set(OsuConfig.ChatAudibleHighlight, true).Disabled = true;
@@ -41,8 +41,12 @@ namespace osu.Game.Database
        [OneToOne(CascadeOperations = CascadeOperation.All)]
        public BeatmapDifficulty Difficulty { get; set; }

+        [Ignore]
+        public BeatmapMetrics Metrics { get; set; }
+
        public string Path { get; set; }

+        [JsonProperty("file_md5")]
        public string Hash { get; set; }

        // General
@@ -0,0 +1,28 @@
+// 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;
+
+namespace osu.Game.Database
+{
+    /// <summary>
+    /// Beatmap metrics based on acculumated online data from community plays.
+    /// </summary>
+    public class BeatmapMetrics
+    {
+        /// <summary>
+        /// Total vote counts of user ratings on a scale of 0..length.
+        /// </summary>
+        public IEnumerable<int> Ratings { get; set; }
+
+        /// <summary>
+        /// Points of failure on a relative time scale (usually 0..100).
+        /// </summary>
+        public IEnumerable<int> Fails { get; set; }
+
+        /// <summary>
+        /// Points of retry on a relative time scale (usually 0..100).
+        /// </summary>
+        public IEnumerable<int> Retries { get; set; }
+    }
+}
@@ -104,7 +104,7 @@ namespace osu.Game.Database
                        score.Replay = score.CreateReplay(reader);
                }
            }
-            
+
            return score;
        }
    }
@@ -56,8 +56,8 @@ namespace osu.Game.Graphics.Containers
        {
            base.Update();

-            if (parallaxEnabled) 
-            { 
+            if (parallaxEnabled)
+            {
                Vector2 offset = input.CurrentState.Mouse == null ? Vector2.Zero : ToLocalSpace(input.CurrentState.Mouse.NativeState.Position) - DrawSize / 2;
                content.MoveTo(offset * ParallaxAmount, firstUpdate ? 0 : 1000, EasingTypes.OutQuint);
                content.Scale = new Vector2(1 + ParallaxAmount);
@@ -13,6 +13,7 @@ using osu.Framework.Graphics.OpenGL.Buffers;
 using OpenTK.Graphics.ES30;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Colour;
+using osu.Framework.Timing;

 namespace osu.Game.Graphics.Cursor
 {
@@ -58,6 +59,9 @@ namespace osu.Game.Graphics.Cursor

        public CursorTrail()
        {
+            // as we are currently very dependent on having a running clock, let's make our own clock for the time being.
+            Clock = new FramedClock();
+
            AlwaysReceiveInput = true;
            RelativeSizeAxes = Axes.Both;

@@ -231,4 +235,4 @@ namespace osu.Game.Graphics.Cursor
            }
        }
    }
-}
+}
@@ -80,14 +80,12 @@ namespace osu.Game.Graphics.Cursor
        protected override void PopIn()
        {
            ActiveCursor.FadeTo(1, 250, EasingTypes.OutQuint);
-            ActiveCursor.ScaleTo(1, 1000, EasingTypes.OutElastic);
+            ActiveCursor.ScaleTo(1, 400, EasingTypes.OutQuint);
        }

        protected override void PopOut()
        {
-            ActiveCursor.FadeTo(0, 1400, EasingTypes.OutQuint);
-            ActiveCursor.ScaleTo(1.1f, 100, EasingTypes.Out);
-            ActiveCursor.Delay(100);
+            ActiveCursor.FadeTo(0, 900, EasingTypes.OutQuint);
            ActiveCursor.ScaleTo(0, 500, EasingTypes.In);
        }

@@ -28,7 +28,7 @@ namespace osu.Game.Graphics
        /// <param name="easing">The tween easing.</param>
        public static void FadeAccent(this IHasAccentColour accentedDrawable, Color4 newColour, double duration = 0, EasingTypes easing = EasingTypes.None)
        {
-            accentedDrawable.TransformTo(accentedDrawable.AccentColour, newColour, duration, easing, new TransformAccent());
+            accentedDrawable.TransformTo(() => accentedDrawable.AccentColour, newColour, duration, easing, new TransformAccent());
        }
    }
 }
@@ -0,0 +1,137 @@
+// 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.Sprites;
+using System;
+
+namespace osu.Game.Graphics.UserInterface
+{
+    public class Bar : Container, IHasAccentColour
+    {
+        private readonly Box background;
+        private readonly Box bar;
+
+        private const int resize_duration = 250;
+
+        private const EasingTypes easing = EasingTypes.InOutCubic;
+
+        private float length;
+        /// <summary>
+        /// Length of the bar, ranges from 0 to 1
+        /// </summary>
+        public float Length
+        {
+            get
+            {
+                return length;
+            }
+            set
+            {
+                length = MathHelper.Clamp(value, 0, 1);
+                updateBarLength();
+            }
+        }
+
+        public Color4 BackgroundColour
+        {
+            get
+            {
+                return background.Colour;
+            }
+            set
+            {
+                background.Colour = value;
+            }
+        }
+
+        public Color4 AccentColour
+        {
+            get
+            {
+                return bar.Colour;
+            }
+            set
+            {
+                bar.Colour = value;
+            }
+        }
+
+        private BarDirection direction = BarDirection.LeftToRight;
+        public BarDirection Direction
+        {
+            get
+            {
+                return direction;
+            }
+            set
+            {
+                direction = value;
+                updateBarLength();
+            }
+        }
+
+        public Bar()
+        {
+            Children = new[]
+            {
+                background = new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = new Color4(0,0,0,0)
+                },
+                bar = new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Width = 0,
+                },
+            };
+        }
+
+        private void updateBarLength()
+        {
+            switch (direction)
+            {
+                case BarDirection.LeftToRight:
+                case BarDirection.RightToLeft:
+                    bar.ResizeTo(new Vector2(length, 1), resize_duration, easing);
+                    break;
+
+                case BarDirection.TopToBottom:
+                case BarDirection.BottomToTop:
+                    bar.ResizeTo(new Vector2(1, length), resize_duration, easing);
+                    break;
+            }
+
+            switch (direction)
+            {
+                case BarDirection.LeftToRight:
+                case BarDirection.TopToBottom:
+                    bar.Anchor = Anchor.TopLeft;
+                    bar.Origin = Anchor.TopLeft;
+                    break;
+
+                case BarDirection.RightToLeft:
+                case BarDirection.BottomToTop:
+                    bar.Anchor = Anchor.BottomRight;
+                    bar.Origin = Anchor.BottomRight;
+                    break;
+            }
+        }
+    }
+
+    [Flags]
+    public enum BarDirection
+    {
+        LeftToRight = 1 << 0,
+        RightToLeft = 1 << 1,
+        TopToBottom = 1 << 2,
+        BottomToTop = 1 << 3,
+
+        Vertical = TopToBottom | BottomToTop,
+        Horizontal = LeftToRight | RightToLeft,
+    }
+}
@@ -0,0 +1,65 @@
+// 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 osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace osu.Game.Graphics.UserInterface
+{
+    public class BarGraph : FillFlowContainer<Bar>
+    {
+        /// <summary>
+        /// Manually sets the max value, if null <see cref="Enumerable.Max(IEnumerable{float})"/> is instead used
+        /// </summary>
+        public float? MaxValue { get; set; }
+
+        private BarDirection direction = BarDirection.BottomToTop;
+        public new BarDirection Direction
+        {
+            get
+            {
+                return direction;
+            }
+            set
+            {
+                direction = value;
+                base.Direction = (direction & BarDirection.Horizontal) > 0 ? FillDirection.Vertical : FillDirection.Horizontal;
+                foreach (var bar in Children)
+                {
+                    bar.Size = (direction & BarDirection.Horizontal) > 0 ? new Vector2(1, 1.0f / Children.Count()) : new Vector2(1.0f / Children.Count(), 1);
+                    bar.Direction = direction;
+                }
+            }
+        }
+
+        /// <summary>
+        /// A list of floats that defines the length of each <see cref="Bar"/>
+        /// </summary>
+        public IEnumerable<float> Values
+        {
+            set
+            {
+                List<Bar> bars = Children.ToList();
+                foreach (var bar in value.Select((length, index) => new { Value = length, Bar = bars.Count > index ? bars[index] : null }))
+                    if (bar.Bar != null)
+                    {
+                        bar.Bar.Length = bar.Value / (MaxValue ?? value.Max());
+                        bar.Bar.Size = (direction & BarDirection.Horizontal) > 0 ? new Vector2(1, 1.0f / value.Count()) : new Vector2(1.0f / value.Count(), 1);
+                    }
+                    else
+                        Add(new Bar
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Size = (direction & BarDirection.Horizontal) > 0 ? new Vector2(1, 1.0f / value.Count()) : new Vector2(1.0f / value.Count(), 1),
+                            Length = bar.Value / (MaxValue ?? value.Max()),
+                            Direction = Direction,
+                        });
+                //I'm using ToList() here because Where() returns an Enumerable which can change it's elements afterwards
+                Remove(Children.Where((bar, index) => index >= value.Count()).ToList());
+            }
+        }
+    }
+}
@@ -3,8 +3,8 @@

 using OpenTK;
 using OpenTK.Graphics;
-using osu.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Configuration;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
@@ -12,18 +12,18 @@ using osu.Framework.Graphics.UserInterface;

 namespace osu.Game.Graphics.UserInterface
 {
-    public class Nub : CircularContainer, IStateful<CheckboxState>
+    public class Nub : CircularContainer, IHasCurrentValue<bool>
    {
        public const float COLLAPSED_SIZE = 20;
        public const float EXPANDED_SIZE = 40;

-        private readonly Box fill;
-
        private const float border_width = 3;
        private Color4 glowingColour, idleColour;

        public Nub()
        {
+            Box fill;
+
            Size = new Vector2(COLLAPSED_SIZE, 12);

            BorderColour = Color4.White;
@@ -40,6 +40,14 @@ namespace osu.Game.Graphics.UserInterface
                    AlwaysPresent = true,
                },
            };
+
+            Current.ValueChanged += newValue =>
+            {
+                if (newValue)
+                    fill.FadeIn(200, EasingTypes.OutQuint);
+                else
+                    fill.FadeTo(0.01f, 200, EasingTypes.OutQuint); //todo: remove once we figure why containers aren't drawing at all times
+            };
        }

        [BackgroundDependencyLoader]
@@ -84,28 +92,6 @@ namespace osu.Game.Graphics.UserInterface
            }
        }

-        private CheckboxState state;
-
-        public CheckboxState State
-        {
-            get
-            {
-                return state;
-            }
-            set
-            {
-                state = value;
-
-                switch (state)
-                {
-                    case CheckboxState.Checked:
-                        fill.FadeIn(200, EasingTypes.OutQuint);
-                        break;
-                    case CheckboxState.Unchecked:
-                        fill.FadeTo(0.01f, 200, EasingTypes.OutQuint); //todo: remove once we figure why containers aren't drawing at all times
-                        break;
-                }
-            }
-        }
+        public Bindable<bool> Current { get; } = new Bindable<bool>();
    }
 }
@@ -23,18 +23,9 @@ namespace osu.Game.Graphics.UserInterface
        {
            set
            {
-                if (bindable != null)
-                    bindable.ValueChanged -= bindableValueChanged;
                bindable = value;
-                if (bindable != null)
-                {
-                    bool state = State == CheckboxState.Checked;
-                    if (state != bindable.Value)
-                        State = bindable.Value ? CheckboxState.Checked : CheckboxState.Unchecked;
-                    bindable.ValueChanged += bindableValueChanged;
-                }
-
-                if (bindable?.Disabled ?? true)
+                Current.BindTo(bindable);
+                if (value?.Disabled ?? true)
                    Alpha = 0.3f;
            }
        }
@@ -83,18 +74,16 @@ namespace osu.Game.Graphics.UserInterface
                    Margin = new MarginPadding { Right = 5 },
                }
            };
-        }

-        private void bindableValueChanged(bool isChecked)
-        {
-            State = isChecked ? CheckboxState.Checked : CheckboxState.Unchecked;
-        }
+            nub.Current.BindTo(Current);

-        protected override void Dispose(bool isDisposing)
-        {
-            if (bindable != null)
-                bindable.ValueChanged -= bindableValueChanged;
-            base.Dispose(isDisposing);
+            Current.ValueChanged += newValue =>
+            {
+                if (newValue)
+                    sampleChecked?.Play();
+                else
+                    sampleUnchecked?.Play();
+            };
        }

        protected override bool OnHover(InputState state)
@@ -117,23 +106,5 @@ namespace osu.Game.Graphics.UserInterface
            sampleChecked = audio.Sample.Get(@"Checkbox/check-on");
            sampleUnchecked = audio.Sample.Get(@"Checkbox/check-off");
        }
-
-        protected override void OnChecked()
-        {
-            sampleChecked?.Play();
-            nub.State = CheckboxState.Checked;
-
-            if (bindable != null)
-                bindable.Value = true;
-        }
-
-        protected override void OnUnchecked()
-        {
-            sampleUnchecked?.Play();
-            nub.State = CheckboxState.Unchecked;
-
-            if (bindable != null)
-                bindable.Value = false;
-        }
    }
 }
@@ -45,7 +45,7 @@ namespace osu.Game.Graphics.UserInterface

        private class OsuDropdownMenuItem : DropdownMenuItem<T>
        {
-            public OsuDropdownMenuItem(string text, T value) : base(text, value)
+            public OsuDropdownMenuItem(string text, T current) : base(text, current)
            {
                Foreground.Padding = new MarginPadding(2);

@@ -2,7 +2,6 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

 using OpenTK;
-using OpenTK.Input;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
@@ -50,7 +49,6 @@ namespace osu.Game.Graphics.UserInterface
                nub = new Nub
                {
                    Origin = Anchor.TopCentre,
-                    State = CheckboxState.Unchecked,
                    Expanded = true,
                }
            };
@@ -64,15 +62,6 @@ namespace osu.Game.Graphics.UserInterface
            rightBox.Colour = colours.Pink;
        }

-        private void playSample()
-        {
-            if (Clock == null || Clock.CurrentTime - lastSampleTime <= 50)
-                return;
-            lastSampleTime = Clock.CurrentTime;
-            sample.Frequency.Value = 1 + NormalizedValue * 0.2f;
-            sample.Play();
-        }
-
        protected override bool OnHover(InputState state)
        {
            nub.Glowing = true;
@@ -85,37 +74,39 @@ namespace osu.Game.Graphics.UserInterface
            base.OnHoverLost(state);
        }

-        protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
+        protected override void OnUserChange()
        {
-            if (args.Key == Key.Left || args.Key == Key.Right)
-                playSample();
-            return base.OnKeyDown(state, args);
+            base.OnUserChange();
+            playSample();
+        }
+
+        private void playSample()
+        {
+            if (Clock == null || Clock.CurrentTime - lastSampleTime <= 50)
+                return;
+            lastSampleTime = Clock.CurrentTime;
+            sample.Frequency.Value = 1 + NormalizedValue * 0.2f;
+
+            if (NormalizedValue == 0)
+                sample.Frequency.Value -= 0.4f;
+            else if (NormalizedValue == 1)
+                sample.Frequency.Value += 0.4f;
+
+            sample.Play();
        }

        protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
        {
-            nub.State = CheckboxState.Checked;
+            nub.Current.Value = true;
            return base.OnMouseDown(state, args);
        }

        protected override bool OnMouseUp(InputState state, MouseUpEventArgs args)
        {
-            nub.State = CheckboxState.Unchecked;
+            nub.Current.Value = false;
            return base.OnMouseUp(state, args);
        }

-        protected override bool OnClick(InputState state)
-        {
-            playSample();
-            return base.OnClick(state);
-        }
-
-        protected override bool OnDrag(InputState state)
-        {
-            playSample();
-            return base.OnDrag(state);
-        }
-
        protected override void UpdateAfterChildren()
        {
            base.UpdateAfterChildren();
@@ -1,7 +1,6 @@
 // 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 OpenTK;
 using OpenTK.Graphics;
 using osu.Framework.Allocation;
@@ -24,8 +23,6 @@ namespace osu.Game.Graphics.UserInterface
        private readonly SpriteText text;
        private readonly TextAwesome icon;

-        public event EventHandler<CheckboxState> Action;
-
        private Color4? accentColour;
        public Color4 AccentColour
        {
@@ -34,7 +31,7 @@ namespace osu.Game.Graphics.UserInterface
            {
                accentColour = value;

-                if (State != CheckboxState.Checked)
+                if (Current)
                {
                    text.Colour = AccentColour;
                    icon.Colour = AccentColour;
@@ -48,20 +45,6 @@ namespace osu.Game.Graphics.UserInterface
            set { text.Text = value; }
        }

-        protected override void OnChecked()
-        {
-            fadeIn();
-            icon.Icon = FontAwesome.fa_check_circle_o;
-            Action?.Invoke(this, State);
-        }
-
-        protected override void OnUnchecked()
-        {
-            fadeOut();
-            icon.Icon = FontAwesome.fa_circle_o;
-            Action?.Invoke(this, State);
-        }
-
        private const float transition_length = 500;

        private void fadeIn()
@@ -84,7 +67,7 @@ namespace osu.Game.Graphics.UserInterface

        protected override void OnHoverLost(InputState state)
        {
-            if (State == CheckboxState.Unchecked)
+            if (!Current)
                fadeOut();

            base.OnHoverLost(state);
@@ -134,6 +117,20 @@ namespace osu.Game.Graphics.UserInterface
                    Anchor = Anchor.BottomLeft,
                }
            };
+
+            Current.ValueChanged += v =>
+            {
+                if (v)
+                {
+                    fadeIn();
+                    icon.Icon = FontAwesome.fa_check_circle_o;
+                }
+                else
+                {
+                    fadeOut();
+                    icon.Icon = FontAwesome.fa_circle_o;
+                }
+            };
        }
    }
 }
@@ -10,10 +10,11 @@ using osu.Game.Graphics.Sprites;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using OpenTK.Graphics;

 namespace osu.Game.Graphics.UserInterface
 {
-    public abstract class RollingCounter<T> : Container
+    public abstract class RollingCounter<T> : Container, IHasAccentColour
    {
        /// <summary>
        /// The current value.
@@ -80,6 +81,12 @@ namespace osu.Game.Graphics.UserInterface
            }
        }

+        public Color4 AccentColour
+        {
+            get { return DisplayedCountSpriteText.Colour; }
+            set { DisplayedCountSpriteText.Colour = value; }
+        }
+
        /// <summary>
        /// Skeleton of a numeric counter which value rolls over time.
        /// </summary>
@@ -108,11 +115,7 @@ namespace osu.Game.Graphics.UserInterface
        {
            base.LoadComplete();

-            Flush(false, TransformType);
-
            DisplayedCountSpriteText.Text = FormatCount(Current);
-            DisplayedCountSpriteText.Anchor = Anchor;
-            DisplayedCountSpriteText.Origin = Origin;
        }

        /// <summary>
@@ -205,8 +208,8 @@ namespace osu.Game.Graphics.UserInterface
                    ? GetProportionalDuration(currentValue, newValue)
                    : RollingDuration;

-            transform.StartTime = Time.Current;
-            transform.EndTime = Time.Current + rollingTotalDuration;
+            transform.StartTime = TransformStartTime;
+            transform.EndTime = TransformStartTime + rollingTotalDuration;
            transform.StartValue = currentValue;
            transform.EndValue = newValue;
            transform.Easing = RollingEasing;
@@ -15,6 +15,8 @@ namespace osu.Game.Graphics.UserInterface
        protected override double RollingDuration => 1000;
        protected override EasingTypes RollingEasing => EasingTypes.Out;

+        public bool UseCommaSeparator;
+
        /// <summary>
        /// How many leading zeroes the counter has.
        /// </summary>
@@ -41,7 +43,12 @@ namespace osu.Game.Graphics.UserInterface

        protected override string FormatCount(double count)
        {
-            return ((long)count).ToString("D" + LeadingZeroes);
+            string format = new string('0', (int)LeadingZeroes);
+            if (UseCommaSeparator)
+                for (int i = format.Length - 3; i > 0; i -= 3)
+                    format = format.Insert(i, @",");
+
+            return ((long)count).ToString(format);
        }

        public override void Increment(double amount)
@@ -0,0 +1,61 @@
+// 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.Framework.Graphics;
+using osu.Framework.Graphics.Transforms;
+using osu.Framework.MathUtils;
+
+namespace osu.Game.Graphics.UserInterface
+{
+    /// <summary>
+    /// Used as an accuracy counter. Represented visually as a percentage.
+    /// </summary>
+    public class SimpleComboCounter : RollingCounter<int>
+    {
+        protected override Type TransformType => typeof(TransformCounterCount);
+
+        protected override double RollingDuration => 750;
+
+        public SimpleComboCounter()
+        {
+            Current.Value = DisplayedCount = 0;
+        }
+
+        protected override string FormatCount(int count)
+        {
+            return $@"{count}x";
+        }
+
+        protected override double GetProportionalDuration(int currentValue, int newValue)
+        {
+            return Math.Abs(currentValue - newValue) * RollingDuration * 100.0f;
+        }
+
+        public override void Increment(int amount)
+        {
+            Current.Value = Current + amount;
+        }
+
+        private class TransformCounterCount : Transform<int>
+        {
+            public override int CurrentValue
+            {
+                get
+                {
+                    double time = Time?.Current ?? 0;
+                    if (time < StartTime) return StartValue;
+                    if (time >= EndTime) return EndValue;
+
+                    return (int)Interpolation.ValueAt(time, StartValue, EndValue, StartTime, EndTime, Easing);
+                }
+            }
+
+            public override void Apply(Drawable d)
+            {
+                base.Apply(d);
+                ((SimpleComboCounter)d).DisplayedCount = CurrentValue;
+            }
+        }
+    }
+}
@@ -109,7 +109,7 @@ namespace osu.Game.Modes.Objects

            // "toFlatten" contains all the curves which are not yet approximated well enough.
            // We use a stack to emulate recursion without the risk of running into a stack overflow.
-            // (More specifically, we iteratively and adaptively refine our curve with a 
+            // (More specifically, we iteratively and adaptively refine our curve with a
            // <a href="https://en.wikipedia.org/wiki/Depth-first_search">Depth-first search</a>
            // over the tree resulting from the subdivisions we make.)
            toFlatten.Push(controlPoints.ToArray());
@@ -66,7 +66,7 @@ namespace osu.Game.Modes.Objects
            double dir = 1;
            double thetaRange = thetaEnd - thetaStart;

-            // Decide in which direction to draw the circle, depending on which side of 
+            // Decide in which direction to draw the circle, depending on which side of
            // AC B lies.
            Vector2 orthoAtoC = c - a;
            orthoAtoC = new Vector2(orthoAtoC.Y, -orthoAtoC.X);
@@ -136,7 +136,7 @@ namespace osu.Game.Modes.Replays
            public ReplayMouseState(Vector2 position, IEnumerable<MouseButton> list)
            {
                Position = position;
-                list.ForEach(b => PressedButtons.Add(b));
+                list.ForEach(b => SetPressed(b, true));
            }
        }

@@ -148,4 +148,4 @@ namespace osu.Game.Modes.Replays
            }
        }
    }
-}
+}
@@ -27,7 +27,24 @@ namespace osu.Game.Modes.Scoring
        public int Combo { get; set; }
        public Mod[] Mods { get; set; }

-        public User User { get; set; }
+        private User user;
+
+        public User User
+        {
+            get
+            {
+                return user ?? new User
+                {
+                    Username = LegacyUsername,
+                    Id = LegacyUserID
+                };
+            }
+
+            set
+            {
+                user = value;
+            }
+        }

        [JsonProperty(@"replay_data")]
        public Replay Replay;
@@ -38,10 +55,10 @@ namespace osu.Game.Modes.Scoring
        public long OnlineScoreID;

        [JsonProperty(@"username")]
-        public string Username;
+        public string LegacyUsername;

        [JsonProperty(@"user_id")]
-        public long UserID;
+        public long LegacyUserID;

        [JsonProperty(@"date")]
        public DateTime Date;
@@ -16,6 +16,7 @@ using System.Diagnostics;
 using System.Linq;
 using osu.Game.Modes.Replays;
 using osu.Game.Modes.Scoring;
+using OpenTK;

 namespace osu.Game.Modes.UI
 {
@@ -32,6 +33,11 @@ namespace osu.Game.Modes.UI
        /// </summary>
        public event Action OnAllJudged;

+        /// <summary>
+        /// Whether to apply adjustments to the child <see cref="Playfield{TObject,TJudgement}"/> based on our own size.
+        /// </summary>
+        public bool AspectAdjust = true;
+
        /// <summary>
        /// The input manager for this HitRenderer.
        /// </summary>
@@ -52,6 +58,8 @@ namespace osu.Game.Modes.UI
        /// </summary>
        public bool HasReplayLoaded => InputManager.ReplayInputHandler != null;

+        public abstract IEnumerable<HitObject> Objects { get; }
+
        /// <summary>
        /// Whether all the HitObjects have been judged.
        /// </summary>
@@ -179,6 +187,8 @@ namespace osu.Game.Modes.UI

        private readonly Container content;

+        public override IEnumerable<HitObject> Objects => Beatmap.HitObjects;
+
        protected HitRenderer(WorkingBeatmap beatmap)
            : base(beatmap)
        {
@@ -219,6 +229,19 @@ namespace osu.Game.Modes.UI
            Playfield.PostProcess();
        }

+        protected override void Update()
+        {
+            base.Update();
+
+            Playfield.Size = AspectAdjust ? GetPlayfieldAspectAdjust() : Vector2.One;
+        }
+
+        /// <summary>
+        /// In some cases we want to apply changes to the relative size of our contained <see cref="Playfield{TObject, TJudgement}"/> based on custom conditions.
+        /// </summary>
+        /// <returns></returns>
+        protected virtual Vector2 GetPlayfieldAspectAdjust() => new Vector2(0.75f); //a sane default
+
        /// <summary>
        /// Triggered when an object's Judgement is updated.
        /// </summary>
@@ -22,10 +22,11 @@ namespace osu.Game.Modes.UI

        private readonly Container content;
        public readonly KeyCounterCollection KeyCounter;
-        public readonly ComboCounter ComboCounter;
+        public readonly RollingCounter<int> ComboCounter;
        public readonly ScoreCounter ScoreCounter;
-        public readonly PercentageCounter AccuracyCounter;
+        public readonly RollingCounter<double> AccuracyCounter;
        public readonly HealthDisplay HealthDisplay;
+        public readonly SongProgress Progress;

        private Bindable<bool> showKeyCounter;
        private Bindable<bool> showHud;
@@ -33,10 +34,11 @@ namespace osu.Game.Modes.UI
        private static bool hasShownNotificationOnce;

        protected abstract KeyCounterCollection CreateKeyCounter();
-        protected abstract ComboCounter CreateComboCounter();
-        protected abstract PercentageCounter CreateAccuracyCounter();
+        protected abstract RollingCounter<int> CreateComboCounter();
+        protected abstract RollingCounter<double> CreateAccuracyCounter();
        protected abstract ScoreCounter CreateScoreCounter();
        protected abstract HealthDisplay CreateHealthDisplay();
+        protected abstract SongProgress CreateProgress();

        protected HudOverlay()
        {
@@ -53,6 +55,7 @@ namespace osu.Game.Modes.UI
                    ScoreCounter = CreateScoreCounter(),
                    AccuracyCounter = CreateAccuracyCounter(),
                    HealthDisplay = CreateHealthDisplay(),
+                    Progress = CreateProgress(),
                }
            });
        }
@@ -26,7 +26,7 @@ namespace osu.Game.Modes.UI
                reapplySize();
            }
        }
-        
+
        public new Color4 Colour
        {
            get
@@ -38,7 +38,7 @@ namespace osu.Game.Modes.UI
                background.Colour = value;
            }
        }
-        
+
        public FontAwesome Icon
        {
            get
@@ -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.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Modes.Objects;
@@ -38,6 +39,9 @@ namespace osu.Game.Modes.UI
        {
            AlwaysReceiveInput = true;

+            // Default height since we force relative size axes
+            Size = Vector2.One;
+
            AddInternal(ScaledContent = new ScaledContainer
            {
                CustomWidth = customWidth,
@@ -63,6 +67,12 @@ namespace osu.Game.Modes.UI
            Add(HitObjects);
        }

+        public override Axes RelativeSizeAxes
+        {
+            get { return Axes.Both; }
+            set { throw new InvalidOperationException($@"{nameof(Playfield<TObject, TJudgement>)}'s {nameof(RelativeSizeAxes)} should never be changed from {Axes.Both}"); }
+        }
+
        /// <summary>
        /// Performs post-processing tasks (if any) after all DrawableHitObjects are loaded into this Playfield.
        /// </summary>
@@ -3,8 +3,6 @@

 using OpenTK;
 using OpenTK.Graphics;
-using osu.Framework.Allocation;
-using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
@@ -12,10 +10,35 @@ using osu.Game.Graphics;

 namespace osu.Game.Modes.UI
 {
-    public class StandardHealthDisplay : HealthDisplay
+    public class StandardHealthDisplay : HealthDisplay, IHasAccentColour
    {
        private readonly Container fill;

+        public Color4 AccentColour
+        {
+            get { return fill.Colour; }
+            set { fill.Colour = value; }
+        }
+
+        private Color4 glowColour;
+        public Color4 GlowColour
+        {
+            get { return glowColour; }
+            set
+            {
+                if (glowColour == value)
+                    return;
+                glowColour = value;
+
+                fill.EdgeEffect = new EdgeEffect
+                {
+                    Colour = glowColour,
+                    Radius = 8,
+                    Type = EdgeEffectType.Glow
+                };
+            }
+        }
+
        public StandardHealthDisplay()
        {
            Children = new Drawable[]
@@ -41,18 +64,6 @@ namespace osu.Game.Modes.UI
            };
        }

-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            fill.Colour = colours.BlueLighter;
-            fill.EdgeEffect = new EdgeEffect
-            {
-                Colour = colours.BlueDarker.Opacity(0.6f),
-                Radius = 8,
-                Type = EdgeEffectType.Glow
-            };
-        }
-
        protected override void SetHealth(float value) => fill.ScaleTo(new Vector2(value, 1), 200, EasingTypes.OutQuint);
    }
 }
@@ -2,8 +2,11 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

 using OpenTK;
+using osu.Framework.Allocation;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Primitives;
+using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Screens.Play;

@@ -11,19 +14,22 @@ namespace osu.Game.Modes.UI
 {
    public class StandardHudOverlay : HudOverlay
    {
-        protected override PercentageCounter CreateAccuracyCounter() => new PercentageCounter
+        protected override RollingCounter<double> CreateAccuracyCounter() => new PercentageCounter
        {
            Anchor = Anchor.TopCentre,
-            Origin = Anchor.TopCentre,
-            Position = new Vector2(0, 65),
+            Origin = Anchor.TopRight,
+            Position = new Vector2(0, 35),
            TextSize = 20,
-            Margin = new MarginPadding { Right = 5 },
+            Margin = new MarginPadding { Right = 140 },
        };

-        protected override ComboCounter CreateComboCounter() => new StandardComboCounter
+        protected override RollingCounter<int> CreateComboCounter() => new SimpleComboCounter
        {
-            Anchor = Anchor.BottomLeft,
-            Origin = Anchor.BottomLeft,
+            Anchor = Anchor.TopCentre,
+            Origin = Anchor.TopLeft,
+            Position = new Vector2(0, 35),
+            Margin = new MarginPadding { Left = 140 },
+            TextSize = 20,
        };

        protected override HealthDisplay CreateHealthDisplay() => new StandardHealthDisplay
@@ -40,6 +46,7 @@ namespace osu.Game.Modes.UI
            Anchor = Anchor.BottomRight,
            Origin = Anchor.BottomRight,
            Margin = new MarginPadding(10),
+            Y = - TwoLayerButton.SIZE_RETRACTED.Y,
        };

        protected override ScoreCounter CreateScoreCounter() => new ScoreCounter(6)
@@ -48,7 +55,28 @@ namespace osu.Game.Modes.UI
            Origin = Anchor.TopCentre,
            TextSize = 40,
            Position = new Vector2(0, 30),
-            Margin = new MarginPadding { Right = 5 },
        };
+
+        protected override SongProgress CreateProgress() => new SongProgress()
+        {
+            Anchor = Anchor.BottomLeft,
+            Origin = Anchor.BottomLeft,
+            RelativeSizeAxes = Axes.X,
+        };
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            ComboCounter.AccentColour = colours.BlueLighter;
+            AccuracyCounter.AccentColour = colours.BlueLighter;
+            ScoreCounter.AccentColour = colours.BlueLighter;
+
+            var shd = HealthDisplay as StandardHealthDisplay;
+            if (shd != null)
+            {
+                shd.AccentColour = colours.BlueLighter;
+                shd.GlowColour = colours.BlueDarker.Opacity(0.6f);
+            }
+        }
    }
 }
@@ -307,6 +307,18 @@ namespace osu.Game
            return base.OnExiting();
        }

+        /// <summary>
+        /// Use to programatically exit the game as if the user was triggering via alt-f4.
+        /// Will keep persisting until an exit occurs (exit may be blocked multiple times).
+        /// </summary>
+        public void GracefullyExit()
+        {
+            if (!OnExiting())
+                Exit();
+            else
+                Scheduler.AddDelayed(GracefullyExit, 2000);
+        }
+
        protected override void UpdateAfterChildren()
        {
            base.UpdateAfterChildren();
@@ -93,7 +93,7 @@ namespace osu.Game.Overlays
        {
            var postText = sender.Text;

-            if (!string.IsNullOrEmpty(postText))
+            if (!string.IsNullOrEmpty(postText) && api.LocalUser.Value != null)
            {
                //todo: actually send to server
                careChannels.FirstOrDefault()?.AddNewMessages(new[]
@@ -5,18 +5,21 @@ using System;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Transforms;
 using osu.Framework.Input;
+using OpenTK;

 namespace osu.Game.Overlays
 {
    public class DragBar : Container
    {
-        private readonly Box fill;
+        protected readonly Container Fill;

        public Action<float> SeekRequested;
-        private bool isDragging;

-        private bool enabled;
+        public bool IsSeeking { get; private set; }
+
+        private bool enabled = true;
        public bool IsEnabled
        {
            get { return enabled; }
@@ -24,7 +27,7 @@ namespace osu.Game.Overlays
            {
                enabled = value;
                if (!enabled)
-                    fill.Width = 0;
+                    Fill.Width = 0;
            }
        }

@@ -34,29 +37,45 @@ namespace osu.Game.Overlays

            Children = new Drawable[]
            {
-                fill = new Box
+                Fill = new Container
                {
-                    Origin = Anchor.CentreLeft,
-                    Anchor = Anchor.CentreLeft,
+                    Name = "FillContainer",
+                    Origin = Anchor.BottomLeft,
+                    Anchor = Anchor.BottomLeft,
                    RelativeSizeAxes = Axes.Both,
-                    Width = 0
+                    Width = 0,
+                    Children = new Drawable[]
+                    {
+                        new Box
+                        {
+                            RelativeSizeAxes = Axes.Both
+                        }
+                    }
                }
            };
        }

        public void UpdatePosition(float position)
        {
-            if (isDragging || !IsEnabled) return;
+            if (IsSeeking || !IsEnabled) return;

-            fill.Width = position;
+            updatePosition(position, false);
        }

        private void seek(InputState state)
        {
-            if (!IsEnabled) return;
            float seekLocation = state.Mouse.Position.X / DrawWidth;
+
+            if (!IsEnabled) return;
+
            SeekRequested?.Invoke(seekLocation);
-            fill.Width = seekLocation;
+            updatePosition(seekLocation);
+        }
+
+        private void updatePosition(float position, bool easing = true)
+        {
+            position = MathHelper.Clamp(position, 0, 1);
+            Fill.TransformTo(() => Fill.Width, position, easing ? 200 : 0, EasingTypes.OutQuint, new TransformSeek());
        }

        protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
@@ -71,12 +90,21 @@ namespace osu.Game.Overlays
            return true;
        }

-        protected override bool OnDragStart(InputState state) => isDragging = true;
+        protected override bool OnDragStart(InputState state) => IsSeeking = true;

        protected override bool OnDragEnd(InputState state)
        {
-            isDragging = false;
+            IsSeeking = false;
            return true;
        }
+
+        private class TransformSeek : TransformFloat
+        {
+            public override void Apply(Drawable d)
+            {
+                base.Apply(d);
+                d.Width = CurrentValue;
+            }
+        }
    }
 }
--- a/Show More
+++ b/Show More