Merge pull request #368 from tacchinotacchi/master

Added basic sorting functionality
Fix some license headers.
2026-05-16 15:03:37 +08:00 · 2017-03-02 18:46:34 +09:00 · 2017-03-02 18:45:20 +09:00 · 2017-03-02 18:35:24 +09:00 · 2017-03-02 18:06:31 +09:00 · 2017-03-02 18:01:41 +09:00
263 changed files with 3309 additions and 1599 deletions
@@ -7,3 +7,21 @@ insert_final_newline = true
 indent_style = space
 indent_size = 4
 trim_trailing_whitespace = true
+
+#Roslyn naming styles
+
+#PascalCase for public and protected members
+dotnet_naming_style.pascalcase.capitalization = pascal_case
+dotnet_naming_symbols.public_members.applicable_accessibilities = public,internal,protected,protected_internal
+dotnet_naming_symbols.public_members.applicable_kinds = property,method,field,event,delegate
+dotnet_naming_rule.public_members_pascalcase.severity = suggestion
+dotnet_naming_rule.public_members_pascalcase.symbols = public_members
+dotnet_naming_rule.public_members_pascalcase.style = pascalcase
+
+#camelCase for private members
+dotnet_naming_style.camelcase.capitalization = camel_case
+dotnet_naming_symbols.private_members.applicable_accessibilities = private
+dotnet_naming_symbols.private_members.applicable_kinds = property,method,field,event,delegate
+dotnet_naming_rule.private_members_camelcase.severity = suggestion
+dotnet_naming_rule.private_members_camelcase.symbols = private_members
+dotnet_naming_rule.private_members_camelcase.style = camelcase
@@ -11,7 +11,7 @@
 *.userprefs

 # Build results
-[Dd]ebug/
+bin/[Dd]ebug/
 [Dd]ebugPublic/
 [Rr]elease/
 [Rr]eleases/
@@ -23,6 +23,10 @@
        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
      </dependentAssembly>
+      <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>
    </assemblyBinding>
  </runtime>
 </configuration>
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

 // General Information about an assembly is controlled through the following 
@@ -36,52 +36,52 @@
    <StartupObject>osu.Desktop.Deploy.Program</StartupObject>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="DeltaCompressionDotNet, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1d14d6e5194e7f4a, processorArchitecture=MSIL">
-      <HintPath>..\packages\DeltaCompressionDotNet.1.0.0\lib\net45\DeltaCompressionDotNet.dll</HintPath>
+    <Reference Include="DeltaCompressionDotNet, Version=1.1.0.0, Culture=neutral, PublicKeyToken=1d14d6e5194e7f4a, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\DeltaCompressionDotNet.1.1.0\lib\net20\DeltaCompressionDotNet.dll</HintPath>
      <Private>True</Private>
    </Reference>
-    <Reference Include="DeltaCompressionDotNet.MsDelta, Version=1.0.0.0, Culture=neutral, PublicKeyToken=46b2138a390abf55, processorArchitecture=MSIL">
-      <HintPath>..\packages\DeltaCompressionDotNet.1.0.0\lib\net45\DeltaCompressionDotNet.MsDelta.dll</HintPath>
+    <Reference Include="DeltaCompressionDotNet.MsDelta, Version=1.1.0.0, Culture=neutral, PublicKeyToken=46b2138a390abf55, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\DeltaCompressionDotNet.1.1.0\lib\net20\DeltaCompressionDotNet.MsDelta.dll</HintPath>
      <Private>True</Private>
    </Reference>
-    <Reference Include="DeltaCompressionDotNet.PatchApi, Version=1.0.0.0, Culture=neutral, PublicKeyToken=3e8888ee913ed789, processorArchitecture=MSIL">
-      <HintPath>..\packages\DeltaCompressionDotNet.1.0.0\lib\net45\DeltaCompressionDotNet.PatchApi.dll</HintPath>
+    <Reference Include="DeltaCompressionDotNet.PatchApi, Version=1.1.0.0, Culture=neutral, PublicKeyToken=3e8888ee913ed789, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\DeltaCompressionDotNet.1.1.0\lib\net20\DeltaCompressionDotNet.PatchApi.dll</HintPath>
      <Private>True</Private>
    </Reference>
    <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\squirrel.windows.1.5.2\lib\Net45\ICSharpCode.SharpZipLib.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\squirrel.windows.1.5.2\lib\Net45\ICSharpCode.SharpZipLib.dll</HintPath>
      <Private>True</Private>
    </Reference>
    <Reference Include="Mono.Cecil, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <HintPath>..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.dll</HintPath>
      <Private>True</Private>
    </Reference>
    <Reference Include="Mono.Cecil.Mdb, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <HintPath>..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Mdb.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.Mdb.dll</HintPath>
      <Private>True</Private>
    </Reference>
    <Reference Include="Mono.Cecil.Pdb, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <HintPath>..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Pdb.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.Pdb.dll</HintPath>
      <Private>True</Private>
    </Reference>
    <Reference Include="Mono.Cecil.Rocks, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <HintPath>..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Rocks.dll</HintPath>
+      <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>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
      <Private>True</Private>
    </Reference>
    <Reference Include="NuGet.Squirrel, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\squirrel.windows.1.5.2\lib\Net45\NuGet.Squirrel.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\squirrel.windows.1.5.2\lib\Net45\NuGet.Squirrel.dll</HintPath>
      <Private>True</Private>
    </Reference>
-    <Reference Include="Splat, Version=1.6.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Splat.1.6.2\lib\Net45\Splat.dll</HintPath>
+    <Reference Include="Splat, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Splat.2.0.0\lib\Net45\Splat.dll</HintPath>
      <Private>True</Private>
    </Reference>
    <Reference Include="Squirrel, Version=1.5.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\squirrel.windows.1.5.2\lib\Net45\Squirrel.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\squirrel.windows.1.5.2\lib\Net45\Squirrel.dll</HintPath>
      <Private>True</Private>
    </Reference>
    <Reference Include="System" />
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="DeltaCompressionDotNet" version="1.0.0" targetFramework="net452" />
-  <package id="Mono.Cecil" version="0.9.6.1" targetFramework="net452" />
+  <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="NuGet.CommandLine" version="3.5.0" targetFramework="net452" developmentDependency="true" />
-  <package id="Splat" version="1.6.2" targetFramework="net452" />
+  <package id="Splat" version="2.0.0" targetFramework="net452" />
  <package id="squirrel.windows" version="1.5.2" targetFramework="net452" />
 </packages>
@@ -25,8 +25,7 @@ namespace osu.Desktop.Tests
                Ruleset.Register(new ManiaRuleset());
                Ruleset.Register(new CatchRuleset());

-                host.Add(new Benchmark());
-                host.Run();
+                host.Run(new Benchmark());
            }
        }
    }
@@ -34,7 +34,7 @@
  <ItemGroup>
    <Reference Include="mscorlib" />
    <Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll</HintPath>
      <Private>True</Private>
    </Reference>
    <Reference Include="SQLite.Net, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
@@ -54,9 +54,6 @@
    <Reference Include="SQLite.Net.Platform.Generic">
      <HintPath>$(SolutionDir)\packages\SQLite.Net-PCL.3.1.1\lib\net40\SQLite.Net.Platform.Generic.dll</HintPath>
    </Reference>
-    <Reference Include="OpenTK">
-      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.2.0.50727.1339\lib\net45\OpenTK.dll</HintPath>
-    </Reference>
  </ItemGroup>
  <ItemGroup>
    <Compile Include="BenchmarkTest.cs" />
@@ -2,20 +2,9 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using osu.Framework;
 using osu.Framework.Allocation;
-using osu.Framework.Desktop.Platform;
-using osu.Framework.GameModes.Testing;
+using osu.Framework.Screens.Testing;
 using osu.Game;
-using osu.Game.Modes;
-using osu.Game.Modes.Catch;
-using osu.Game.Modes.Mania;
-using osu.Game.Modes.Osu;
-using osu.Game.Modes.Taiko;

 namespace osu.Desktop.VisualTests
 {
@@ -24,7 +13,7 @@ namespace osu.Desktop.VisualTests
        private double timePerTest = 200;

        [BackgroundDependencyLoader]
-        private void load(BaseGame game)
+        private void load()
        {
            Host.MaximumDrawHz = int.MaxValue;
            Host.MaximumUpdateHz = int.MaxValue;
@@ -3,7 +3,6 @@

 using System;
 using osu.Framework.Desktop;
-using osu.Framework.Desktop.Platform;
 using osu.Framework.Platform;
 using osu.Game.Modes;
 using osu.Game.Modes.Catch;
@@ -20,7 +19,7 @@ namespace osu.Desktop.VisualTests
        {
            bool benchmark = args.Length > 0 && args[0] == @"-benchmark";

-            using (BasicGameHost host = Host.GetSuitableHost(@"osu"))
+            using (GameHost host = Host.GetSuitableHost(@"osu"))
            {
                Ruleset.Register(new OsuRuleset());
                Ruleset.Register(new TaikoRuleset());
@@ -28,10 +27,9 @@ namespace osu.Desktop.VisualTests
                Ruleset.Register(new CatchRuleset());

                if (benchmark)
-                    host.Add(new Benchmark());
+                    host.Run(new Benchmark());
                else
-                    host.Add(new VisualTestGame());
-                host.Run();
+                    host.Run(new VisualTestGame());
            }
        }
    }
@@ -1,22 +1,10 @@
 // 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 System.Diagnostics;
-using System.Linq;
-using osu.Framework;
-using osu.Framework.GameModes.Testing;
-using osu.Framework.Graphics;
+using osu.Framework.Screens.Testing;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Sprites;
 using osu.Framework.Threading;
-using osu.Game;
-using osu.Game.Online.API;
-using osu.Game.Online.API.Requests;
-using osu.Game.Online.Chat;
-using OpenTK;
-using osu.Framework.Allocation;
-using osu.Game.Online.Chat.Drawables;
+using osu.Game.Overlays;

 namespace osu.Desktop.VisualTests.Tests
 {
@@ -25,119 +13,16 @@ namespace osu.Desktop.VisualTests.Tests
        private ScheduledDelegate messageRequest;

        public override string Name => @"Chat";
-        public override string Description => @"Testing API polling";
-
-        FlowContainer flow;
-
-        private Scheduler scheduler = new Scheduler();
-
-        private APIAccess api;
-
-        private ChannelDisplay channelDisplay;
-
-        [BackgroundDependencyLoader]
-        private void load(APIAccess api)
-        {
-            this.api = api;
-        }
+        public override string Description => @"Testing chat api and overlay";

        public override void Reset()
        {
            base.Reset();

-            if (api.State != APIState.Online)
-                api.OnStateChange += delegate { initializeChannels(); };
-            else
-                initializeChannels();
-        }
-
-        protected override void Update()
-        {
-            scheduler.Update();
-            base.Update();
-        }
-
-        private long? lastMessageId;
-
-        List<Channel> careChannels;
-
-        private void initializeChannels()
-        {
-            careChannels = new List<Channel>();
-
-            if (api.State != APIState.Online)
-                return;
-
-            Add(flow = new FlowContainer
+            Add(new ChatOverlay()
            {
-                RelativeSizeAxes = Axes.Both,
-                Direction = FlowDirections.Vertical
+                State = Visibility.Visible
            });
-
-            SpriteText loading;
-            Add(loading = new SpriteText
-            {
-                Text = @"Loading available channels...",
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                TextSize = 40,
-            });
-
-            messageRequest?.Cancel();
-
-            ListChannelsRequest req = new ListChannelsRequest();
-            req.Success += delegate (List<Channel> channels)
-            {
-                Scheduler.Add(delegate
-                {
-                    loading.FadeOut(100);
-                });
-
-                addChannel(channels.Find(c => c.Name == @"#osu"));
-                addChannel(channels.Find(c => c.Name == @"#lobby"));
-                addChannel(channels.Find(c => c.Name == @"#english"));
-
-                messageRequest = scheduler.AddDelayed(() => FetchNewMessages(api), 1000, true);
-            };
-            api.Queue(req);
-        }
-
-        private void addChannel(Channel channel)
-        {
-            flow.Add(channelDisplay = new ChannelDisplay(channel)
-            {
-                Size = new Vector2(1, 0.3f)
-            });
-
-            careChannels.Add(channel);
-        }
-
-        GetMessagesRequest fetchReq;
-
-        public void FetchNewMessages(APIAccess api)
-        {
-            if (fetchReq != null) return;
-
-            fetchReq = new GetMessagesRequest(careChannels, lastMessageId);
-            fetchReq.Success += delegate (List<Message> messages)
-            {
-                foreach (Message m in messages)
-                {
-                    careChannels.Find(c => c.Id == m.ChannelId).AddNewMessages(m);
-                }
-
-                lastMessageId = messages.LastOrDefault()?.Id ?? lastMessageId;
-
-                Debug.Write("success!");
-                fetchReq = null;
-            };
-            fetchReq.Failure += delegate
-            {
-                Debug.Write("failure!");
-                fetchReq = null;
-            };
-
-            api.Queue(fetchReq);
        }
    }
 }
@@ -0,0 +1,80 @@
+// 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.Screens.Testing;
+using osu.Game.Graphics;
+using osu.Game.Overlays;
+using osu.Game.Overlays.Dialog;
+
+namespace osu.Desktop.VisualTests.Tests
+{
+    class TestCaseDialogOverlay : TestCase
+    {
+        public override string Name => @"Dialog Overlay";
+        public override string Description => @"Display dialogs";
+
+        DialogOverlay overlay;
+
+        public override void Reset()
+        {
+            base.Reset();
+
+            Add(overlay = new DialogOverlay());
+
+            AddButton("dialog #1", () => overlay.Push(new PopupDialog
+            {
+                Icon = FontAwesome.fa_trash_o,
+                HeaderText = @"Confirm deletion of",
+                BodyText = @"Ayase Rie - Yuima-ru*World TVver.",
+                Buttons = new PopupDialogButton[]
+                {
+                    new PopupDialogOkButton
+                    {
+                        Text = @"I never want to see this again.",
+                        Action = () => System.Console.WriteLine(@"OK"),
+                    },
+                    new PopupDialogCancelButton
+                    {
+                        Text = @"Firetruck, I still want quick ranks!",
+                        Action = () => System.Console.WriteLine(@"Cancel"),
+                    },
+                },
+            }));
+
+            AddButton("dialog #2", () => overlay.Push(new PopupDialog
+            {
+                Icon = FontAwesome.fa_gear,
+                HeaderText = @"What do you want to do with",
+                BodyText = "Camellia as \"Bang Riot\" - Blastix Riotz",
+                Buttons = new PopupDialogButton[]
+                {
+                    new PopupDialogOkButton
+                    {
+                        Text = @"Manage collections",
+                    },
+                    new PopupDialogOkButton
+                    {
+                        Text = @"Delete...",
+                    },
+                    new PopupDialogOkButton
+                    {
+                        Text = @"Remove from unplayed",
+                    },
+                    new PopupDialogOkButton
+                    {
+                        Text = @"Clear local scores",
+                    },
+                    new PopupDialogOkButton
+                    {
+                        Text = @"Edit",
+                    },
+                    new PopupDialogCancelButton
+                    {
+                        Text = @"Cancel",
+                    },
+                },
+            }));
+        }
+    }
+}
@@ -2,20 +2,17 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

 using System.Collections.Generic;
-using osu.Framework.GameModes.Testing;
+using osu.Framework.Screens.Testing;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.MathUtils;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
-using osu.Game.Modes.Catch;
 using osu.Game.Modes.Catch.UI;
-using osu.Game.Modes.Mania;
 using osu.Game.Modes.Mania.UI;
 using osu.Game.Modes.Objects;
-using osu.Game.Modes.Osu;
 using osu.Game.Modes.Osu.Objects;
 using osu.Game.Modes.Osu.UI;
-using osu.Game.Modes.Taiko;
 using osu.Game.Modes.Taiko.UI;
 using OpenTK;

@@ -31,9 +28,6 @@ namespace osu.Desktop.VisualTests.Tests
        {
            base.Reset();

-            //ensure we are at offset 0
-            Clock = new FramedClock();
-
            List<HitObject> objects = new List<HitObject>();

            int time = 500;
@@ -56,33 +50,42 @@ namespace osu.Desktop.VisualTests.Tests

            Add(new Drawable[]
            {
-                new OsuHitRenderer
+                new Container
                {
-                    Beatmap = beatmap,
-                    Scale = new Vector2(0.5f),
-                    Anchor = Anchor.TopLeft,
-                    Origin = Anchor.TopLeft
-                },
-                new TaikoHitRenderer
-                {
-                    Beatmap = beatmap,
-                    Scale = new Vector2(0.5f),
-                    Anchor = Anchor.TopRight,
-                    Origin = Anchor.TopRight
-                },
-                new CatchHitRenderer
-                {
-                    Beatmap = beatmap,
-                    Scale = new Vector2(0.5f),
-                    Anchor = Anchor.BottomLeft,
-                    Origin = Anchor.BottomLeft
-                },
-                new ManiaHitRenderer
-                {
-                    Beatmap = beatmap,
-                    Scale = new Vector2(0.5f),
-                    Anchor = Anchor.BottomRight,
-                    Origin = Anchor.BottomRight
+                    RelativeSizeAxes = Axes.Both,
+                    //ensure we are at offset 0
+                    Clock = new FramedClock(),
+                    Children = new Drawable[]
+                    {
+                        new OsuHitRenderer
+                        {
+                            Beatmap = beatmap,
+                            Scale = new Vector2(0.5f),
+                            Anchor = Anchor.TopLeft,
+                            Origin = Anchor.TopLeft
+                        },
+                        new TaikoHitRenderer
+                        {
+                            Beatmap = beatmap,
+                            Scale = new Vector2(0.5f),
+                            Anchor = Anchor.TopRight,
+                            Origin = Anchor.TopRight
+                        },
+                        new CatchHitRenderer
+                        {
+                            Beatmap = beatmap,
+                            Scale = new Vector2(0.5f),
+                            Anchor = Anchor.BottomLeft,
+                            Origin = Anchor.BottomLeft
+                        },
+                        new ManiaHitRenderer
+                        {
+                            Beatmap = beatmap,
+                            Scale = new Vector2(0.5f),
+                            Anchor = Anchor.BottomRight,
+                            Origin = Anchor.BottomRight
+                        }
+                    }
                }
            });
        }
@@ -2,21 +2,17 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

 using System.Collections.Generic;
-using osu.Framework;
-using osu.Framework.GameModes.Testing;
+using osu.Framework.Screens.Testing;
 using osu.Framework.Graphics;
 using osu.Framework.Timing;
 using OpenTK;
-using osu.Framework.Allocation;
 using osu.Framework.Configuration;
-using osu.Game.Modes.Objects;
 using osu.Game.Modes.Objects.Drawables;
 using osu.Game.Modes.Osu.Objects;
 using osu.Game.Modes.Osu.Objects.Drawables;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
-using osu.Game.Modes;
 using OpenTK.Graphics;

 namespace osu.Desktop.VisualTests.Tests
@@ -99,7 +95,7 @@ namespace osu.Desktop.VisualTests.Tests
            AddButton(@"slider", () => load(HitObjectType.Slider));
            AddButton(@"spinner", () => load(HitObjectType.Spinner));

-            AddToggle(@"auto", () => { auto = !auto; load(mode); });
+            AddToggle(@"auto", (state) => { auto = state; load(mode); });

            ButtonsContainer.Add(new SpriteText { Text = "Playback Speed" });
            ButtonsContainer.Add(new BasicSliderBar<double>
@@ -1,18 +1,16 @@
 // 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.GameModes.Testing;
+using osu.Framework.Screens.Testing;
 using osu.Framework.Graphics;
-using osu.Game.Graphics.UserInterface;
 using OpenTK.Input;
-using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Configuration;
 using OpenTK;
 using OpenTK.Graphics;
 using osu.Framework.MathUtils;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Transformations;
+using osu.Framework.Graphics.Transforms;
 using osu.Game.Screens.Play;

 namespace osu.Desktop.VisualTests.Tests
@@ -1,7 +1,7 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

-using osu.Framework.GameModes.Testing;
+using osu.Framework.Screens.Testing;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Screens.Menu;
@@ -1,10 +1,11 @@
 // 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.GameModes.Testing;
+using osu.Framework.Screens.Testing;
 using osu.Framework.Graphics;
 using osu.Framework.Timing;
 using osu.Game.Overlays;
+using osu.Framework.Graphics.Containers;

 namespace osu.Desktop.VisualTests.Tests
 {
@@ -30,7 +31,7 @@ namespace osu.Desktop.VisualTests.Tests
                Anchor = Anchor.Centre
            };
            Add(mc);
-            AddToggle(@"Show", mc.ToggleVisibility);
+            AddToggle(@"Show", (state) => mc.State = state ? Visibility.Visible : Visibility.Hidden);
        }
    }
 }
@@ -3,13 +3,12 @@

 using System.Collections.Generic;
 using osu.Framework.Graphics;
-using osu.Framework.GameModes.Testing;
+using osu.Framework.Screens.Testing;
 using osu.Framework.MathUtils;
-using osu.Framework.Timing;
 using osu.Game.Overlays;
 using System.Linq;
 using osu.Game.Overlays.Notifications;
-using osu.Game.Screens.Backgrounds;
+using osu.Framework.Graphics.Containers;

 namespace osu.Desktop.VisualTests.Tests
 {
@@ -32,7 +31,7 @@ namespace osu.Desktop.VisualTests.Tests
                Origin = Anchor.TopRight,
            });

-            AddToggle(@"show", manager.ToggleVisibility);
+            AddToggle(@"show", (state) => manager.State = state ? Visibility.Visible : Visibility.Hidden);

            AddButton(@"simple #1", sendNotification1);
            AddButton(@"simple #2", sendNotification2);
@@ -1,12 +1,8 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

-using osu.Framework.GameModes.Testing;
-using osu.Framework.Graphics;
-using osu.Game.Graphics.UserInterface;
-using OpenTK.Input;
+using osu.Framework.Screens.Testing;
 using osu.Game.Overlays;
-using osu.Framework.Graphics.Containers;

 namespace osu.Desktop.VisualTests.Tests
 {
@@ -1,16 +1,9 @@
 // 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.Graphics;
 using osu.Framework.Logging;
-using osu.Framework.Graphics;
 using osu.Game.Overlays.Pause;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Colour;
-using osu.Framework.GameModes.Testing;
-using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Screens.Testing;

 namespace osu.Desktop.VisualTests.Tests
 {
@@ -1,9 +1,11 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

+using System; 
 using System.Collections.Generic;
 using osu.Desktop.VisualTests.Platform;
-using osu.Framework.GameModes.Testing;
+using osu.Framework.Screens.Testing;
+using osu.Framework.MathUtils;
 using osu.Game.Database;
 using osu.Game.Modes;
 using osu.Game.Screens.Select;
@@ -14,6 +16,7 @@ namespace osu.Desktop.VisualTests.Tests
    {
        private BeatmapDatabase db, oldDb;
        private TestStorage storage;
+        private PlaySongSelect songSelect;

        public override string Name => @"Song Select";
        public override string Description => @"with fake data";
@@ -35,9 +38,15 @@ namespace osu.Desktop.VisualTests.Tests

                db.Import(sets);
            }
-            Add(new PlaySongSelect());
+
+            Add(songSelect = new PlaySongSelect());
+
+            AddButton(@"Sort by Artist", delegate { songSelect.Filter.Sort = FilterControl.SortMode.Artist; });
+            AddButton(@"Sort by Title", delegate { songSelect.Filter.Sort = FilterControl.SortMode.Title; });
+            AddButton(@"Sort by Author", delegate { songSelect.Filter.Sort = FilterControl.SortMode.Author; });
+            AddButton(@"Sort by Difficulty", delegate { songSelect.Filter.Sort = FilterControl.SortMode.Difficulty; });
        }
-        
+
        protected override void Dispose(bool isDisposing)
        {
            if (oldDb != null)
@@ -59,9 +68,10 @@ namespace osu.Desktop.VisualTests.Tests
                Metadata = new BeatmapMetadata
                {
                    OnlineBeatmapSetID = 1234 + i,
-                    Artist = "MONACA",
-                    Title = "Black Song",
-                    Author = "Some Guy",
+                    // Create random metadata, then we can check if sorting works based on these
+                    Artist = "MONACA " + RNG.Next(0, 9),
+                    Title = "Black Song " + RNG.Next(0, 9),
+                    Author = "Some Guy " + RNG.Next(0, 9),
                },
                Beatmaps = new List<BeatmapInfo>(new[]
                {
@@ -3,13 +3,12 @@

 using System.Collections.Generic;
 using osu.Framework.Allocation;
-using osu.Framework.GameModes.Testing;
-using osu.Framework.MathUtils;
-using osu.Framework.Timing;
+using osu.Framework.Screens.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Formats;
 using OpenTK;
 using osu.Framework.Graphics.Sprites;
+using osu.Game.Beatmaps.IO;
 using osu.Game.Database;
 using osu.Game.Modes;
 using osu.Game.Modes.Objects;
@@ -60,25 +59,48 @@ namespace osu.Desktop.VisualTests.Tests

                Beatmap b = new Beatmap
                {
-                    HitObjects = objects
+                    HitObjects = objects,
+                    BeatmapInfo = new BeatmapInfo
+                    {
+                        Metadata = new BeatmapMetadata
+                        {
+                            Artist = @"Unknown",
+                            Title = @"Sample Beatmap",
+                            Author = @"peppy",
+                        }
+                    }
                };

                decoder.Process(b);

-                beatmap = new WorkingBeatmap(b);
+                beatmap = new TestWorkingBeatmap(b);
            }

            Add(new Box
            {
                RelativeSizeAxes = Framework.Graphics.Axes.Both,
-                Colour = Color4.Gray,
+                Colour = Color4.Black,
            });

-            Add(new Player
+            Add(new PlayerLoader(new Player
            {
                PreferredPlayMode = PlayMode.Osu,
                Beatmap = beatmap
+            })
+            {
+                Beatmap = beatmap
            });
        }
+
+        class TestWorkingBeatmap : WorkingBeatmap
+        {
+            public TestWorkingBeatmap(Beatmap beatmap)
+                : base(beatmap.BeatmapInfo, beatmap.BeatmapInfo.BeatmapSet)
+            {
+                Beatmap = beatmap;
+            }
+
+            protected override ArchiveReader GetReader() => null;
+        }
    }
 }
@@ -2,22 +2,16 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

 using System;
-using osu.Framework.GameModes.Testing;
+using osu.Framework.Screens.Testing;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.MathUtils;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Modes;
-using osu.Game.Modes.Catch;
 using osu.Game.Modes.Catch.UI;
-using osu.Game.Modes.Mania;
 using osu.Game.Modes.Mania.UI;
-using osu.Game.Modes.Osu;
 using osu.Game.Modes.Osu.UI;
-using osu.Game.Modes.Taiko;
 using osu.Game.Modes.Taiko.UI;
 using osu.Game.Modes.UI;
-using osu.Game.Screens.Play;
 using OpenTK;
 using OpenTK.Graphics;
 using osu.Framework.Graphics.Primitives;
@@ -164,7 +158,7 @@ namespace osu.Desktop.VisualTests.Tests

            AddButton(@"Alter stars", delegate
            {
-                stars.Count = RNG.NextSingle() * (stars.MaxStars + 1);
+                stars.Count = RNG.NextSingle() * (stars.StarCount + 1);
                starsLabel.Text = stars.Count.ToString("0.00");
            });

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

 using System;
-using osu.Framework.GameModes.Testing;
+using osu.Framework.Screens.Testing;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.MathUtils;
@@ -22,9 +22,9 @@ namespace osu.Desktop.VisualTests.Tests
        {
            base.Reset();

-            FlowContainer flow;
+            FillFlowContainer flow;

-            Add(flow = new FlowContainer()
+            Add(flow = new FillFlowContainer()
            {
                RelativeSizeAxes = Axes.Both,
                Size = new Vector2(0.5f),
@@ -1,13 +1,9 @@
 // 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.GameModes.Testing;
-using osu.Framework.Graphics.Colour;
-using osu.Framework.Graphics.Sprites;
+using osu.Framework.Screens.Testing;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Screens.Menu;
 using osu.Game.Screens.Play;
-using OpenTK.Graphics;

 namespace osu.Desktop.VisualTests.Tests
 {
@@ -1,16 +1,8 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

-using osu.Framework;
-using osu.Framework.GameModes.Testing;
-using osu.Framework.Graphics.Cursor;
-using osu.Game.Database;
+using osu.Framework.Screens.Testing;
 using osu.Game;
-using osu.Framework.Desktop.Platform;
-using System.Reflection;
-using System.IO;
-using System.Collections.Generic;
-using osu.Framework.Allocation;
 using osu.Game.Screens.Backgrounds;

 namespace osu.Desktop.VisualTests
@@ -21,7 +13,7 @@ namespace osu.Desktop.VisualTests
        {
            base.LoadComplete();

-            (new BackgroundModeDefault() { Depth = 10 }).Preload(this, AddInternal);
+            (new BackgroundScreenDefault() { Depth = 10 }).LoadAsync(this, AddInternal);

            // Have to construct this here, rather than in the constructor, because
            // we depend on some dependencies to be loaded within OsuGameBase.load().
@@ -82,6 +82,10 @@
  </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>
    <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>
@@ -99,9 +103,8 @@
    <Reference Include="SQLite.Net.Platform.Generic">
      <HintPath>$(SolutionDir)\packages\SQLite.Net-PCL.3.1.1\lib\net40\SQLite.Net.Platform.Generic.dll</HintPath>
    </Reference>
-    <Reference Include="OpenTK">
-      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.2.0.50727.1339\lib\net45\OpenTK.dll</HintPath>
-    </Reference>
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Xml" />
  </ItemGroup>
  <ItemGroup>
    <None Include="..\osu.licenseheader">
@@ -191,6 +194,7 @@
    <Compile Include="Platform\TestStorage.cs" />
    <Compile Include="Tests\TestCaseOptions.cs" />
    <Compile Include="Tests\TestCasePauseOverlay.cs" />
+    <Compile Include="Tests\TestCaseDialogOverlay.cs" />
  </ItemGroup>
  <ItemGroup />
  <ItemGroup />
@@ -5,7 +5,7 @@ Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/maste
 -->
 <packages>
  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
-  <package id="ppy.OpenTK" version="2.0.50727.1339" targetFramework="net45" />
+  <package id="ppy.OpenTK" version="2.0.50727.1340" 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" />
@@ -1,9 +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 System.IO;
-using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Beatmaps.Formats;
 using osu.Game.Beatmaps.IO;
@@ -2,37 +2,42 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

 using osu.Game;
-using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 using osu.Framework.Platform;
 using osu.Framework.Desktop.Platform;
-using osu.Game.Database;
 using osu.Desktop.Overlays;
 using System.Reflection;
 using System.Drawing;
+using osu.Game.Screens.Menu;

 namespace osu.Desktop
 {
    class OsuGameDesktop : OsuGame
    {
+        private VersionManager versionManager;
+
+        public override bool IsDeployedBuild => versionManager.IsDeployedBuild;
+
        public OsuGameDesktop(string[] args = null)
            : base(args)
        {
-
+            versionManager = new VersionManager { Depth = int.MinValue };
        }

        protected override void LoadComplete()
        {
            base.LoadComplete();

-            (new VersionManager()).Preload(this, Add);
+            versionManager.LoadAsync(this);
+            ModeChanged += m =>
+            {
+                if (!versionManager.IsAlive && m is Intro)
+                    Add(versionManager);
+            };
        }

-        public override void SetHost(BasicGameHost host)
+        public override void SetHost(GameHost host)
        {
            base.SetHost(host);
            var desktopWindow = host.Window as DesktopGameWindow;
@@ -51,7 +56,7 @@ namespace osu.Desktop
            // this method will only be executed if e.Effect in dragEnter gets set to something other that None.
            var dropData = e.Data.GetData(DataFormats.FileDrop) as object[];
            var filePaths = dropData.Select(f => f.ToString()).ToArray();
-            ImportBeatmaps(filePaths);
+            ImportBeatmapsAsync(filePaths);
        }

        private void dragEnter(DragEventArgs e)
@@ -1,9 +1,11 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

+using System;
 using System.Diagnostics;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Overlays;
@@ -15,13 +17,18 @@ using osu.Framework.Graphics.Textures;
 using osu.Game.Graphics;
 using OpenTK;
 using OpenTK.Graphics;
+using System.Net.Http;

 namespace osu.Desktop.Overlays
 {
    public class VersionManager : OverlayContainer
    {
        private UpdateManager updateManager;
-        private NotificationManager notification;
+        private NotificationManager notificationManager;
+
+        AssemblyName assembly = Assembly.GetEntryAssembly().GetName();
+
+        public bool IsDeployedBuild => assembly.Version.Major > 0;

        protected override bool HideOnEscape => false;

@@ -30,7 +37,7 @@ namespace osu.Desktop.Overlays
        [BackgroundDependencyLoader]
        private void load(NotificationManager notification, OsuColour colours, TextureStore textures)
        {
-            this.notification = notification;
+            notificationManager = notification;

            AutoSizeAxes = Axes.Both;
            Anchor = Anchor.BottomCentre;
@@ -40,30 +47,29 @@ namespace osu.Desktop.Overlays
            bool isDebug = false;
            Debug.Assert(isDebug = true);

-            var asm = Assembly.GetEntryAssembly().GetName();
            string version;
-            if (asm.Version.Major == 0)
+            if (!IsDeployedBuild)
            {
                version = @"local " + (isDebug ? @"debug" : @"release");
            }
            else
-                version = $@"{asm.Version.Major}.{asm.Version.Minor}.{asm.Version.Build}";
+                version = $@"{assembly.Version.Major}.{assembly.Version.Minor}.{assembly.Version.Build}";

            Children = new Drawable[]
            {
-                new FlowContainer
+                new FillFlowContainer
                {
                    AutoSizeAxes = Axes.Both,
-                    Direction = FlowDirections.Vertical,
+                    Direction = FillDirection.Down,
                    Children = new Drawable[]
                    {
-                        new FlowContainer
+                        new FillFlowContainer
                        {
                            AutoSizeAxes = Axes.Both,
-                            Direction = FlowDirections.Horizontal,
+                            Direction = FillDirection.Right,
+                            Spacing = new Vector2(5),
                            Anchor = Anchor.TopCentre,
                            Origin = Anchor.TopCentre,
-                            Spacing = new Vector2(5),
                            Children = new Drawable[]
                            {
                                new OsuSpriteText
@@ -89,13 +95,16 @@ namespace osu.Desktop.Overlays
                        },
                        new Sprite
                        {
+                            Anchor = Anchor.TopCentre,
+                            Origin = Anchor.TopCentre,
                            Texture = textures.Get(@"Menu/dev-build-footer"),
                        },
                    }
                }
            };

-            updateChecker();
+            if (IsDeployedBuild)
+                checkForUpdateAsync();
        }

        protected override void LoadComplete()
@@ -110,32 +119,71 @@ namespace osu.Desktop.Overlays
            updateManager?.Dispose();
        }

-        private async void updateChecker()
+        private async void checkForUpdateAsync(bool useDeltaPatching = true, UpdateProgressNotification notification = null)
        {
-            updateManager = await UpdateManager.GitHubUpdateManager(@"https://github.com/ppy/osu", @"osulazer", null, null, true);
+            //should we schedule a retry on completion of this check?
+            bool scheduleRetry = true;

-            if (!updateManager.IsInstalledApp)
-                return;
-
-            var info = await updateManager.CheckForUpdate();
-            if (info.ReleasesToApply.Count > 0)
+            try
            {
-                ProgressNotification n = new UpdateProgressNotification
+                if (updateManager == null) updateManager = await UpdateManager.GitHubUpdateManager(@"https://github.com/ppy/osu", @"osulazer", null, null, true);
+
+                var info = await updateManager.CheckForUpdate(!useDeltaPatching);
+                if (info.ReleasesToApply.Count == 0)
+                    //no updates available. bail and retry later.
+                    return;
+
+                if (notification == null)
                {
-                    Text = @"Downloading update..."
-                };
-                Schedule(() => notification.Post(n));
-                Schedule(() => n.State = ProgressNotificationState.Active);
-                await updateManager.DownloadReleases(info.ReleasesToApply, (int p) => Schedule(() => n.Progress = p / 100f));
-                Schedule(() => n.Text = @"Installing update...");
-                await updateManager.ApplyReleases(info, (int p) => Schedule(() => n.Progress = p / 100f));
-                Schedule(() => n.State = ProgressNotificationState.Completed);
+                    notification = new UpdateProgressNotification { State = ProgressNotificationState.Active };
+                    Schedule(() => notificationManager.Post(notification));
+                }

+                Schedule(() =>
+                {
+                    notification.Progress = 0;
+                    notification.Text = @"Downloading update...";
+                });
+
+                try
+                {
+                    await updateManager.DownloadReleases(info.ReleasesToApply, p => Schedule(() => notification.Progress = p / 100f));
+
+                    Schedule(() =>
+                    {
+                        notification.Progress = 0;
+                        notification.Text = @"Installing update...";
+                    });
+
+                    await updateManager.ApplyReleases(info, p => Schedule(() => notification.Progress = p / 100f));
+
+                    Schedule(() => notification.State = ProgressNotificationState.Completed);
+                }
+                catch (Exception)
+                {
+                    if (useDeltaPatching)
+                    {
+                        //could fail if deltas are unavailable for full update path (https://github.com/Squirrel/Squirrel.Windows/issues/959)
+                        //try again without deltas.
+                        checkForUpdateAsync(false, notification);
+                        scheduleRetry = false;
+                    }
+                }
            }
-            else
+            catch (HttpRequestException)
            {
-                //check again every 30 minutes.
-                Scheduler.AddDelayed(updateChecker, 60000 * 30);
+                //likely have no internet connection.
+                //we'll ignore this and retry later.
+            }
+            finally
+            {
+                if (scheduleRetry)
+                {
+                    //check again in 30 minutes.
+                    Scheduler.AddDelayed(() => checkForUpdateAsync(), 60000 * 30);
+                    if (notification != null)
+                        notification.State = ProgressNotificationState.Cancelled;
+                }
            }
        }

@@ -159,6 +207,25 @@ namespace osu.Desktop.Overlays
                    return true;
                }
            };
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours)
+            {
+                IconContent.Add(new Drawable[]
+                {
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        ColourInfo = ColourInfo.GradientVertical(colours.YellowDark, colours.Yellow)
+                    },
+                    new TextAwesome
+                    {
+                        Anchor = Anchor.Centre,
+                        Icon = FontAwesome.fa_upload,
+                        Colour = Color4.White,
+                    }
+                });
+            }
        }
    }
 }
@@ -3,14 +3,9 @@

 using System;
 using System.IO;
-using System.Linq;
-using System.Threading;
 using osu.Desktop.Beatmaps.IO;
-using osu.Framework;
 using osu.Framework.Desktop;
 using osu.Framework.Desktop.Platform;
-using osu.Framework.Platform;
-using osu.Game;
 using osu.Game.IPC;
 using osu.Game.Modes;
 using osu.Game.Modes.Catch;
@@ -40,7 +35,7 @@ namespace osu.Desktop
                    foreach (var file in args)
                    {
                        Console.WriteLine(@"Importing {0}", file);
-                        if (!importer.Import(Path.GetFullPath(file)).Wait(3000))
+                        if (!importer.ImportAsync(Path.GetFullPath(file)).Wait(3000))
                            throw new TimeoutException(@"IPC took too long to send");
                    }
                }
@@ -51,9 +46,7 @@ namespace osu.Desktop
                    Ruleset.Register(new ManiaRuleset());
                    Ruleset.Register(new CatchRuleset());

-                    BaseGame osu = new OsuGameDesktop(args);
-                    host.Add(osu);
-                    host.Run();
+                    host.Run(new OsuGameDesktop(args));
                }
                return 0;
            }
@@ -2,7 +2,6 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

 // General Information about an assembly is controlled through the following 
@@ -10,6 +10,10 @@ Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/maste
        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
      </dependentAssembly>
+      <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>
    </assemblyBinding>
  </runtime>
 </configuration>
@@ -89,54 +89,64 @@
    <ApplicationManifest>Properties\app.manifest</ApplicationManifest>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="DeltaCompressionDotNet, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1d14d6e5194e7f4a, processorArchitecture=MSIL">
-      <HintPath>..\packages\DeltaCompressionDotNet.1.0.0\lib\net45\DeltaCompressionDotNet.dll</HintPath>
+    <Reference Include="DeltaCompressionDotNet, Version=1.1.0.0, Culture=neutral, PublicKeyToken=1d14d6e5194e7f4a, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\DeltaCompressionDotNet.1.1.0\lib\net20\DeltaCompressionDotNet.dll</HintPath>
      <Private>True</Private>
    </Reference>
-    <Reference Include="DeltaCompressionDotNet.MsDelta, Version=1.0.0.0, Culture=neutral, PublicKeyToken=46b2138a390abf55, processorArchitecture=MSIL">
-      <HintPath>..\packages\DeltaCompressionDotNet.1.0.0\lib\net45\DeltaCompressionDotNet.MsDelta.dll</HintPath>
+    <Reference Include="DeltaCompressionDotNet.MsDelta, Version=1.1.0.0, Culture=neutral, PublicKeyToken=46b2138a390abf55, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\DeltaCompressionDotNet.1.1.0\lib\net20\DeltaCompressionDotNet.MsDelta.dll</HintPath>
      <Private>True</Private>
    </Reference>
-    <Reference Include="DeltaCompressionDotNet.PatchApi, Version=1.0.0.0, Culture=neutral, PublicKeyToken=3e8888ee913ed789, processorArchitecture=MSIL">
-      <HintPath>..\packages\DeltaCompressionDotNet.1.0.0\lib\net45\DeltaCompressionDotNet.PatchApi.dll</HintPath>
+    <Reference Include="DeltaCompressionDotNet.PatchApi, Version=1.1.0.0, Culture=neutral, PublicKeyToken=3e8888ee913ed789, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\DeltaCompressionDotNet.1.1.0\lib\net20\DeltaCompressionDotNet.PatchApi.dll</HintPath>
      <Private>True</Private>
    </Reference>
    <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\squirrel.windows.1.5.2\lib\Net45\ICSharpCode.SharpZipLib.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\squirrel.windows.1.5.2\lib\Net45\ICSharpCode.SharpZipLib.dll</HintPath>
      <Private>True</Private>
    </Reference>
    <Reference Include="Mono.Cecil, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <HintPath>..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.dll</HintPath>
      <Private>True</Private>
    </Reference>
    <Reference Include="Mono.Cecil.Mdb, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <HintPath>..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Mdb.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.Mdb.dll</HintPath>
      <Private>True</Private>
    </Reference>
    <Reference Include="Mono.Cecil.Pdb, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <HintPath>..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Pdb.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.Pdb.dll</HintPath>
      <Private>True</Private>
    </Reference>
    <Reference Include="Mono.Cecil.Rocks, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <HintPath>..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Rocks.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.Rocks.dll</HintPath>
      <Private>True</Private>
    </Reference>
    <Reference Include="mscorlib" />
    <Reference Include="NuGet.Squirrel, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\squirrel.windows.1.5.2\lib\Net45\NuGet.Squirrel.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\squirrel.windows.1.5.2\lib\Net45\NuGet.Squirrel.dll</HintPath>
      <Private>True</Private>
    </Reference>
    <Reference Include="OpenTK, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4" />
-    <Reference Include="Splat, Version=1.6.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Splat.1.6.2\lib\Net45\Splat.dll</HintPath>
+    <Reference Include="Splat, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Splat.2.0.0\lib\Net45\Splat.dll</HintPath>
      <Private>True</Private>
    </Reference>
    <Reference Include="Squirrel, Version=1.5.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\squirrel.windows.1.5.2\lib\Net45\Squirrel.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\squirrel.windows.1.5.2\lib\Net45\Squirrel.dll</HintPath>
      <Private>True</Private>
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Drawing" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Net.Http.Extensions, Version=2.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Extensions.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Net.Http.Primitives, Version=4.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Primitives.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Net.Http.WebRequest" />
    <Reference Include="System.Windows.Forms" />
  </ItemGroup>
  <ItemGroup>
@@ -219,7 +229,6 @@
  <ItemGroup>
    <Content Include="lazer.ico" />
  </ItemGroup>
-  <ItemGroup />
  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
  <!-- 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.
@@ -4,8 +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="DeltaCompressionDotNet" version="1.0.0" targetFramework="net45" />
-  <package id="Mono.Cecil" version="0.9.6.1" targetFramework="net45" />
-  <package id="Splat" version="1.6.2" targetFramework="net45" />
+  <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="Splat" version="2.0.0" targetFramework="net45" />
  <package id="squirrel.windows" version="1.5.2" targetFramework="net45" />
 </packages>
@@ -0,0 +1,27 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Beatmaps;
+using osu.Game.Modes.Catch.Objects;
+using osu.Game.Modes.Objects;
+using System;
+using System.Collections.Generic;
+
+namespace osu.Game.Modes.Catch
+{
+    public class CatchDifficultyCalculator : DifficultyCalculator<CatchBaseHit>
+    {
+        protected override PlayMode PlayMode => PlayMode.Catch;
+
+        public CatchDifficultyCalculator(Beatmap beatmap) : base(beatmap)
+        {
+        }
+
+        protected override HitObjectConverter<CatchBaseHit> Converter => new CatchConverter();
+
+        protected override double CalculateInternal(Dictionary<String, String> categoryDifficulty)
+        {
+            return 0;
+        }
+    }
+}
@@ -1,11 +1,9 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

-using System.Collections.Generic;
 using osu.Game.Graphics;
 using osu.Game.Modes.Catch.UI;
 using osu.Game.Modes.Objects;
-using osu.Game.Modes.Osu.Objects;
 using osu.Game.Modes.Osu.UI;
 using osu.Game.Modes.UI;
 using osu.Game.Beatmaps;
@@ -25,5 +23,7 @@ namespace osu.Game.Modes.Catch
        public override ScoreProcessor CreateScoreProcessor(int hitObjectCount) => null;

        public override HitObjectParser CreateHitObjectParser() => new NullHitObjectParser();
+
+        public override DifficultyCalculator CreateDifficultyCalculator(Beatmap beatmap) => new CatchDifficultyCalculator(beatmap);
    }
 }
@@ -5,7 +5,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
-using osu.Framework.Graphics.Transformations;
+using osu.Framework.Graphics.Transforms;
 using OpenTK;

 namespace osu.Game.Modes.Catch.Objects.Drawable
@@ -2,7 +2,6 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

 // General Information about an assembly is controlled through the following 
@@ -33,7 +33,7 @@
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="OpenTK, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
-      <HintPath>..\packages\ppy.OpenTK.2.0.50727.1339\lib\net45\OpenTK.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.2.0.50727.1340\lib\net45\OpenTK.dll</HintPath>
      <Private>True</Private>
    </Reference>
    <Reference Include="System" />
@@ -47,6 +47,7 @@
    <Reference Include="System.Xml" />
  </ItemGroup>
  <ItemGroup>
+    <Compile Include="CatchDifficultyCalculator.cs" />
    <Compile Include="Objects\CatchBaseHit.cs" />
    <Compile Include="Objects\CatchConverter.cs" />
    <Compile Include="Objects\Drawable\DrawableFruit.cs" />
@@ -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.1339" targetFramework="net45" />
+  <package id="ppy.OpenTK" version="2.0.50727.1340" targetFramework="net45" />
 </packages>
@@ -0,0 +1,30 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Beatmaps;
+using osu.Game.Modes.Mania.Objects;
+using osu.Game.Modes.Objects;
+using System;
+using System.Collections.Generic;
+
+namespace osu.Game.Modes.Mania
+{
+    public class ManiaDifficultyCalculator : DifficultyCalculator<ManiaBaseHit>
+    {
+        protected override PlayMode PlayMode => PlayMode.Mania;
+
+        private int columns;
+
+        public ManiaDifficultyCalculator(Beatmap beatmap, int columns = 5) : base(beatmap)
+        {
+            this.columns = columns;
+        }
+
+        protected override HitObjectConverter<ManiaBaseHit> Converter => new ManiaConverter(columns);
+
+        protected override double CalculateInternal(Dictionary<String, String> categoryDifficulty)
+        {
+            return 0;
+        }
+    }
+}
@@ -1,12 +1,9 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

-using System.Collections.Generic;
 using osu.Game.Graphics;
 using osu.Game.Modes.Mania.UI;
 using osu.Game.Modes.Objects;
-using osu.Game.Modes.Osu;
-using osu.Game.Modes.Osu.Objects;
 using osu.Game.Modes.Osu.UI;
 using osu.Game.Modes.UI;
 using osu.Game.Beatmaps;
@@ -26,5 +23,7 @@ namespace osu.Game.Modes.Mania
        public override ScoreProcessor CreateScoreProcessor(int hitObjectCount) => null;

        public override HitObjectParser CreateHitObjectParser() => new NullHitObjectParser();
+
+        public override DifficultyCalculator CreateDifficultyCalculator(Beatmap beatmap) => new ManiaDifficultyCalculator(beatmap);
    }
 }
@@ -4,7 +4,7 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
-using osu.Framework.Graphics.Transformations;
+using osu.Framework.Graphics.Transforms;
 using osu.Framework.Graphics;
 using OpenTK;

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

 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

 // General Information about an assembly is controlled through the following 
@@ -2,7 +2,7 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Transformations;
+using osu.Framework.Graphics.Transforms;
 using osu.Game.Modes.Taiko.UI;
 using OpenTK.Graphics;

@@ -33,7 +33,7 @@
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="OpenTK, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
-      <HintPath>..\packages\ppy.OpenTK.2.0.50727.1339\lib\net45\OpenTK.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.2.0.50727.1340\lib\net45\OpenTK.dll</HintPath>
      <Private>True</Private>
    </Reference>
    <Reference Include="System" />
@@ -47,6 +47,7 @@
    <Reference Include="System.Xml" />
  </ItemGroup>
  <ItemGroup>
+    <Compile Include="ManiaDifficultyCalculator.cs" />
    <Compile Include="Objects\Drawable\DrawableNote.cs" />
    <Compile Include="Objects\HoldNote.cs" />
    <Compile Include="Objects\ManiaBaseHit.cs" />
@@ -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.1339" targetFramework="net45" />
+  <package id="ppy.OpenTK" version="2.0.50727.1340" targetFramework="net45" />
 </packages>
@@ -6,7 +6,7 @@ using OpenTK.Graphics;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Transformations;
+using osu.Framework.Graphics.Transforms;
 using osu.Game.Graphics;

 namespace osu.Game.Modes.Osu.Objects.Drawables.Connections
@@ -3,7 +3,7 @@

 using System;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Transformations;
+using osu.Framework.Graphics.Transforms;
 using osu.Game.Modes.Objects.Drawables;
 using osu.Game.Modes.Osu.Objects.Drawables.Pieces;
 using OpenTK;
@@ -107,7 +107,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables

            if (repeat > currentRepeat)
            {
-                if (ball.Tracking)
+                if (repeat < slider.RepeatCount && ball.Tracking)
                    PlaySample();
                currentRepeat = repeat;
            }
@@ -7,7 +7,7 @@ using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Transformations;
+using osu.Framework.Graphics.Transforms;
 using osu.Game.Beatmaps.Samples;
 using osu.Game.Modes.Objects.Drawables;
 using OpenTK;
@@ -53,7 +53,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
            };
        }

-        private AudioSample sample;
+        private SampleChannel sample;

        [BackgroundDependencyLoader]
        private void load(AudioManager audio)
@@ -4,7 +4,7 @@
 using System;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Transformations;
+using osu.Framework.Graphics.Transforms;
 using osu.Framework.MathUtils;
 using osu.Game.Modes.Objects.Drawables;
 using osu.Game.Modes.Osu.Objects.Drawables.Pieces;
@@ -108,7 +108,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
            }
        }

-        private Vector2 scaleToCircle => new Vector2(circle.Scale * circle.DrawWidth / DrawWidth) * 0.95f;
+        private Vector2 scaleToCircle => (circle.Scale * circle.DrawWidth / DrawWidth) * 0.95f;

        private float spinsPerMinuteNeeded = 100 + (5 * 15); //TODO: read per-map OD and place it on the 5

@@ -120,12 +120,15 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
        {
            base.UpdatePreemptState();

-            FadeIn(200);
            circleContainer.ScaleTo(1, 400, EasingTypes.OutElastic);

-            background.Delay(TIME_PREEMPT - 100);
+            background.Delay(TIME_PREEMPT - 500);
+
+            background.ScaleTo(scaleToCircle * 1.2f, 400, EasingTypes.OutQuint);
            background.FadeIn(200);
-            background.ScaleTo(1, 200, EasingTypes.OutQuint);
+
+            background.Delay(400);
+            background.ScaleTo(1, 250, EasingTypes.OutQuint);

            disc.Delay(TIME_PREEMPT - 50);
            disc.FadeIn(200);
@@ -5,7 +5,7 @@ using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Transformations;
+using osu.Framework.Graphics.Transforms;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Modes.Objects.Drawables;
 using OpenTK;
@@ -13,7 +13,7 @@ using OpenTK.Graphics;

 namespace osu.Game.Modes.Osu.Objects.Drawables
 {
-    public class HitExplosion : FlowContainer
+    public class HitExplosion : FillFlowContainer
    {
        private readonly OsuJudgementInfo judgement;
        private SpriteText line1;
@@ -25,7 +25,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
            AutoSizeAxes = Axes.Both;
            Origin = Anchor.Centre;

-            Direction = FlowDirections.Vertical;
+            Direction = FillDirection.Down;
            Spacing = new Vector2(0, 2);
            Position = (h?.StackedEndPosition ?? Vector2.Zero) + judgement.PositionOffset;

@@ -1,14 +1,11 @@
 // 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.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
-using osu.Framework.Input;
-using OpenTK;

 namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
 {
@@ -25,7 +25,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
                {
                    BlendingMode = BlendingMode.Additive,
                    RelativeSizeAxes = Axes.Both,
-                    Alpha = 0.1f,
+                    Alpha = 0.2f,
                }
            };
        }
@@ -1,14 +1,11 @@
 // 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.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Textures;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
-using OpenTK;
 using OpenTK.Graphics;

 namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
@@ -1,11 +1,9 @@
 // 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.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Textures;
 using OpenTK;
 using OpenTK.Graphics;

@@ -4,9 +4,8 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Transformations;
+using osu.Framework.Graphics.Transforms;
 using osu.Framework.Input;
-using OpenTK;
 using OpenTK.Graphics;

 namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
@@ -8,7 +8,7 @@ using osu.Framework.Configuration;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.OpenGL.Textures;
-using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Lines;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Configuration;
 using OpenTK;
@@ -1,14 +1,8 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;

 namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
@@ -8,9 +8,8 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Transformations;
+using osu.Framework.Graphics.Transforms;
 using osu.Framework.Input;
-using osu.Framework.Logging;
 using osu.Game.Graphics;
 using OpenTK;
 using OpenTK.Graphics;
@@ -173,7 +172,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces

        private int completeTick;

-        private bool updateCompleteTick() => completeTick != (completeTick = (int)(RotationAbsolute / 720));
+        private bool updateCompleteTick() => completeTick != (completeTick = (int)(RotationAbsolute / 360));

        protected override void Update()
        {
@@ -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 osu.Game.Graphics.Backgrounds;

 namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
@@ -15,6 +14,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
        public TrianglesPiece()
        {
            TriangleScale = 1.2f;
+            HideAlphaDiscrepancies = false;
        }

        protected override void Update()
@@ -5,5 +5,6 @@ namespace osu.Game.Modes.Osu.Objects
 {
    public class HitCircle : OsuHitObject
    {
+        public override HitObjectType Type => HitObjectType.Circle;
    }
 }
@@ -2,7 +2,6 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

 using System;
-using osu.Game.Beatmaps.Samples;
 using osu.Game.Modes.Objects;
 using OpenTK;
 using osu.Game.Beatmaps;
@@ -25,6 +24,8 @@ namespace osu.Game.Modes.Osu.Objects

        public float Scale { get; set; } = 1;

+        public abstract HitObjectType Type { get; }
+
        public override void SetDefaultsFromBeatmap(Beatmap beatmap)
        {
            base.SetDefaultsFromBeatmap(beatmap);
@@ -36,14 +37,12 @@ namespace osu.Game.Modes.Osu.Objects
    [Flags]
    public enum HitObjectType
    {
-        Circle = 1,
-        Slider = 2,
-        NewCombo = 4,
-        CircleNewCombo = 5,
-        SliderNewCombo = 6,
-        Spinner = 8,
+        Circle = 1 << 0,
+        Slider = 1 << 1,
+        NewCombo = 1 << 2,
+        Spinner = 1 << 3,
        ColourHax = 122,
-        Hold = 128,
-        ManiaLong = 128,
+        Hold = 1 << 7,
+        SliderTick = 1 << 8,
    }
 }
@@ -0,0 +1,201 @@
+// 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 System;
+using System.Diagnostics;
+using System.Linq;
+
+namespace osu.Game.Modes.Osu.Objects
+{
+    class OsuHitObjectDifficulty
+    {
+        /// <summary>
+        /// Factor by how much speed / aim strain decays per second.
+        /// </summary>
+        /// <remarks>
+        /// These values are results of tweaking a lot and taking into account general feedback.
+        /// Opinionated observation: Speed is easier to maintain than accurate jumps.
+        /// </remarks>
+        internal static readonly double[] DECAY_BASE = { 0.3, 0.15 };
+
+        /// <summary>
+        /// Pseudo threshold values to distinguish between "singles" and "streams"
+        /// </summary>
+        /// <remarks>
+        ///  Of course the border can not be defined clearly, therefore the algorithm has a smooth transition between those values.
+        ///  They also are based on tweaking and general feedback.
+        /// </remarks>
+        private const double stream_spacing_threshold = 110,
+                             single_spacing_threshold = 125;
+
+        /// <summary>
+        /// Scaling values for weightings to keep aim and speed difficulty in balance.
+        /// </summary>
+        /// <remarks>
+        /// Found from testing a very large map pool (containing all ranked maps) and keeping the average values the same.
+        /// </remarks>
+        private static readonly double[] spacing_weight_scaling = { 1400, 26.25 };
+
+        /// <summary>
+        /// Almost the normed diameter of a circle (104 osu pixel). That is -after- position transforming.
+        /// </summary>
+        private const double almost_diameter = 90;
+
+        internal OsuHitObject BaseHitObject;
+        internal double[] Strains = { 1, 1 };
+
+        internal int MaxCombo = 1;
+
+        private float scalingFactor;
+        private float lazySliderLength;
+
+        private Vector2 startPosition;
+        private Vector2 endPosition;
+
+        internal OsuHitObjectDifficulty(OsuHitObject baseHitObject)
+        {
+            BaseHitObject = baseHitObject;
+            float circleRadius = baseHitObject.Scale * 64;
+
+            Slider slider = BaseHitObject as Slider;
+            if (slider != null)
+                MaxCombo += slider.Ticks.Count();
+
+            // We will scale everything by this factor, so we can assume a uniform CircleSize among beatmaps.
+            scalingFactor = (52.0f / circleRadius);
+            if (circleRadius < 30)
+            {
+                float smallCircleBonus = Math.Min(30.0f - circleRadius, 5.0f) / 50.0f;
+                scalingFactor *= 1.0f + smallCircleBonus;
+            }
+
+            lazySliderLength = 0;
+            startPosition = baseHitObject.StackedPosition;
+
+            // Calculate approximation of lazy movement on the slider
+            if (slider != null)
+            {
+                float sliderFollowCircleRadius = circleRadius * 3; // Not sure if this is correct, but here we do not need 100% exact values. This comes pretty darn close in my tests.
+
+                // For simplifying this step we use actual osu! coordinates and simply scale the length, that we obtain by the ScalingFactor later
+                Vector2 cursorPos = startPosition;
+
+                Action<Vector2> addSliderVertex = delegate (Vector2 pos)
+                {
+                    Vector2 difference = pos - cursorPos;
+                    float distance = difference.Length;
+
+                    // Did we move away too far?
+                    if (distance > sliderFollowCircleRadius)
+                    {
+                        // Yep, we need to move the cursor
+                        difference.Normalize(); // Obtain the direction of difference. We do no longer need the actual difference
+                        distance -= sliderFollowCircleRadius;
+                        cursorPos += difference * distance; // We move the cursor just as far as needed to stay in the follow circle
+                        lazySliderLength += distance;
+                    }
+                };
+
+                // Actual computation of the first lazy curve
+                foreach (var tick in slider.Ticks)
+                    addSliderVertex(tick.StackedPosition);
+
+                addSliderVertex(baseHitObject.StackedEndPosition);
+
+                lazySliderLength *= scalingFactor;
+                endPosition = cursorPos;
+            }
+            // We have a normal HitCircle or a spinner
+            else
+                endPosition = startPosition;
+        }
+
+        internal void CalculateStrains(OsuHitObjectDifficulty previousHitObject, double timeRate)
+        {
+            calculateSpecificStrain(previousHitObject, OsuDifficultyCalculator.DifficultyType.Speed, timeRate);
+            calculateSpecificStrain(previousHitObject, OsuDifficultyCalculator.DifficultyType.Aim, timeRate);
+        }
+
+        // Caution: The subjective values are strong with this one
+        private static double spacingWeight(double distance, OsuDifficultyCalculator.DifficultyType type)
+        {
+            switch (type)
+            {
+                case OsuDifficultyCalculator.DifficultyType.Speed:
+                    if (distance > single_spacing_threshold)
+                        return 2.5;
+                    else if (distance > stream_spacing_threshold)
+                        return 1.6 + 0.9 * (distance - stream_spacing_threshold) / (single_spacing_threshold - stream_spacing_threshold);
+                    else if (distance > almost_diameter)
+                        return 1.2 + 0.4 * (distance - almost_diameter) / (stream_spacing_threshold - almost_diameter);
+                    else if (distance > almost_diameter / 2)
+                        return 0.95 + 0.25 * (distance - (almost_diameter / 2)) / (almost_diameter / 2);
+                    else
+                        return 0.95;
+
+                case OsuDifficultyCalculator.DifficultyType.Aim:
+                    return Math.Pow(distance, 0.99);
+            }
+
+            Debug.Assert(false, "Invalid osu difficulty hit object type.");
+            return 0;
+        }
+
+        private void calculateSpecificStrain(OsuHitObjectDifficulty previousHitObject, OsuDifficultyCalculator.DifficultyType type, double timeRate)
+        {
+            double addition = 0;
+            double timeElapsed = (BaseHitObject.StartTime - previousHitObject.BaseHitObject.StartTime) / timeRate;
+            double decay = Math.Pow(DECAY_BASE[(int)type], timeElapsed / 1000);
+
+            if (BaseHitObject.Type == HitObjectType.Spinner)
+            {
+                // Do nothing for spinners
+            }
+            else if (BaseHitObject.Type == HitObjectType.Slider)
+            {
+                switch (type)
+                {
+                    case OsuDifficultyCalculator.DifficultyType.Speed:
+
+                        // For speed strain we treat the whole slider as a single spacing entity, since "Speed" is about how hard it is to click buttons fast.
+                        // The spacing weight exists to differentiate between being able to easily alternate or having to single.
+                        addition =
+                            spacingWeight(previousHitObject.lazySliderLength +
+                                          DistanceTo(previousHitObject), type) *
+                            spacing_weight_scaling[(int)type];
+
+                        break;
+                    case OsuDifficultyCalculator.DifficultyType.Aim:
+
+                        // For Aim strain we treat each slider segment and the jump after the end of the slider as separate jumps, since movement-wise there is no difference
+                        // to multiple jumps.
+                        addition =
+                            (
+                                spacingWeight(previousHitObject.lazySliderLength, type) +
+                                spacingWeight(DistanceTo(previousHitObject), type)
+                            ) *
+                            spacing_weight_scaling[(int)type];
+
+                        break;
+                }
+            }
+            else if (BaseHitObject.Type == HitObjectType.Circle)
+            {
+                addition = spacingWeight(DistanceTo(previousHitObject), type) * spacing_weight_scaling[(int)type];
+            }
+
+            // Scale addition by the time, that elapsed. Filter out HitObjects that are too close to be played anyway to avoid crazy values by division through close to zero.
+            // You will never find maps that require this amongst ranked maps.
+            addition /= Math.Max(timeElapsed, 50);
+
+            Strains[(int)type] = previousHitObject.Strains[(int)type] * decay + addition;
+        }
+
+        internal double DistanceTo(OsuHitObjectDifficulty other)
+        {
+            // Scale the distance by circle size.
+            return (startPosition - other.endPosition).Length * scalingFactor;
+        }
+    }
+}
@@ -4,9 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using osu.Game.Beatmaps.Samples;
 using osu.Game.Modes.Objects;
 using OpenTK;
@@ -57,10 +57,10 @@ namespace osu.Game.Modes.Osu.Objects
            ControlPoint overridePoint;
            ControlPoint timingPoint = beatmap.TimingPointAt(StartTime, out overridePoint);
            var velocityAdjustment = overridePoint?.VelocityAdjustment ?? 1;
-            var baseVelocity = 100 * baseDifficulty.SliderMultiplier;
+            var baseVelocity = 100 * baseDifficulty.SliderMultiplier / velocityAdjustment;

-            Velocity = baseVelocity / (timingPoint.BeatLength * velocityAdjustment);
-            TickDistance = baseVelocity / (baseDifficulty.SliderTickRate * velocityAdjustment);
+            Velocity = baseVelocity / timingPoint.BeatLength;
+            TickDistance = baseVelocity / baseDifficulty.SliderTickRate;
        }

        public int RepeatCount = 1;
@@ -110,6 +110,8 @@ namespace osu.Game.Modes.Osu.Objects
                }
            }
        }
+
+        public override HitObjectType Type => HitObjectType.Slider;
    }

    public enum CurveTypes
@@ -5,7 +5,6 @@ using System.Collections.Generic;
 using OpenTK;
 using System.Linq;
 using osu.Framework.MathUtils;
-using System.Diagnostics;

 namespace osu.Game.Modes.Osu.Objects
 {
@@ -29,26 +28,21 @@ namespace osu.Game.Modes.Osu.Objects
                case CurveTypes.Linear:
                    return subControlPoints;
                case CurveTypes.PerfectCurve:
-                    // If we have a different amount than 3 control points, use bezier for perfect curves.
-                    if (ControlPoints.Count != 3)
-                        return new BezierApproximator(subControlPoints).CreateBezier();
-                    else
-                    {
-                        Debug.Assert(subControlPoints.Count == 3);
+                    //we can only use CircularArc iff we have exactly three control points and no dissection.
+                    if (ControlPoints.Count != 3 || subControlPoints.Count != 3)
+                        break;

-                        // Here we have exactly 3 control points. Attempt to fit a circular arc.
-                        List<Vector2> subpath = new CircularArcApproximator(subControlPoints[0], subControlPoints[1], subControlPoints[2]).CreateArc();
+                    // Here we have exactly 3 control points. Attempt to fit a circular arc.
+                    List<Vector2> subpath = new CircularArcApproximator(subControlPoints[0], subControlPoints[1], subControlPoints[2]).CreateArc();

-                        if (subpath.Count == 0)
-                            // For some reason a circular arc could not be fit to the 3 given points. Fall back
-                            // to a numerically stable bezier approximation.
-                            subpath = new BezierApproximator(subControlPoints).CreateBezier();
+                    // If for some reason a circular arc could not be fit to the 3 given points, fall back to a numerically stable bezier approximation.
+                    if (subpath.Count == 0)
+                        break;

-                        return subpath;
-                    }
-                default:
-                    return new BezierApproximator(subControlPoints).CreateBezier();
+                    return subpath;
            }
+
+            return new BezierApproximator(subControlPoints).CreateBezier();
        }

        private void calculatePath()
@@ -181,7 +175,7 @@ namespace osu.Game.Modes.Osu.Objects
            path.Clear();

            int i = 0;
-            for (; i < calculatedPath.Count && cumulativeLength[i] < d0; ++i);
+            for (; i < calculatedPath.Count && cumulativeLength[i] < d0; ++i) ;

            path.Add(interpolateVertices(i, d0) + Offset);

@@ -1,9 +1,12 @@
-using OpenTK;
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

 namespace osu.Game.Modes.Osu.Objects
 {
    public class SliderTick : OsuHitObject
    {
        public int RepeatIndex { get; set; }
+
+        public override HitObjectType Type => HitObjectType.SliderTick;
    }
 }
@@ -1,8 +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 osu.Game.Beatmaps;
-
 namespace osu.Game.Modes.Osu.Objects
 {
    public class Spinner : OsuHitObject
@@ -10,5 +8,7 @@ namespace osu.Game.Modes.Osu.Objects
        public double Length;

        public override double EndTime => StartTime + Length;
+
+        public override HitObjectType Type => HitObjectType.Spinner;
    }
 }
@@ -0,0 +1,193 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Beatmaps;
+using osu.Game.Modes.Osu.Objects;
+using System;
+using System.Collections.Generic;
+using osu.Game.Modes.Objects;
+
+namespace osu.Game.Modes.Osu
+{
+    public class OsuDifficultyCalculator : DifficultyCalculator<OsuHitObject>
+    {
+        private const double star_scaling_factor = 0.0675;
+        private const double extreme_scaling_factor = 0.5;
+
+        protected override PlayMode PlayMode => PlayMode.Osu;
+
+        /// <summary>
+        /// HitObjects are stored as a member variable.
+        /// </summary>
+        internal List<OsuHitObjectDifficulty> DifficultyHitObjects = new List<OsuHitObjectDifficulty>();
+
+        public OsuDifficultyCalculator(Beatmap beatmap) : base(beatmap)
+        {
+        }
+
+        protected override HitObjectConverter<OsuHitObject> Converter => new OsuHitObjectConverter();
+
+        protected override void PreprocessHitObjects()
+        {
+            foreach (var h in Objects)
+                if (h.Type == HitObjectType.Slider)
+                    ((Slider)h).Curve.Calculate();
+        }
+
+        protected override double CalculateInternal(Dictionary<String, String> categoryDifficulty)
+        {
+            // Fill our custom DifficultyHitObject class, that carries additional information
+            DifficultyHitObjects.Clear();
+
+            foreach (var hitObject in Objects)
+                DifficultyHitObjects.Add(new OsuHitObjectDifficulty(hitObject));
+
+            // Sort DifficultyHitObjects by StartTime of the HitObjects - just to make sure.
+            DifficultyHitObjects.Sort((a, b) => a.BaseHitObject.StartTime.CompareTo(b.BaseHitObject.StartTime));
+
+            if (!CalculateStrainValues()) return 0;
+
+            double speedDifficulty = CalculateDifficulty(DifficultyType.Speed);
+            double aimDifficulty = CalculateDifficulty(DifficultyType.Aim);
+
+            // OverallDifficulty is not considered in this algorithm and neither is HpDrainRate. That means, that in this form the algorithm determines how hard it physically is
+            // to play the map, assuming, that too much of an error will not lead to a death.
+            // It might be desirable to include OverallDifficulty into map difficulty, but in my personal opinion it belongs more to the weighting of the actual peformance
+            // and is superfluous in the beatmap difficulty rating.
+            // If it were to be considered, then I would look at the hit window of normal HitCircles only, since Sliders and Spinners are (almost) "free" 300s and take map length
+            // into account as well.
+
+            // The difficulty can be scaled by any desired metric.
+            // In osu!tp it gets squared to account for the rapid increase in difficulty as the limit of a human is approached. (Of course it also gets scaled afterwards.)
+            // It would not be suitable for a star rating, therefore:
+
+            // The following is a proposal to forge a star rating from 0 to 5. It consists of taking the square root of the difficulty, since by simply scaling the easier
+            // 5-star maps would end up with one star.
+            double speedStars = Math.Sqrt(speedDifficulty) * star_scaling_factor;
+            double aimStars = Math.Sqrt(aimDifficulty) * star_scaling_factor;
+
+            if (categoryDifficulty != null)
+            {
+                categoryDifficulty.Add("Aim", aimStars.ToString("0.00"));
+                categoryDifficulty.Add("Speed", speedStars.ToString("0.00"));
+
+                double hitWindow300 = 30/*HitObjectManager.HitWindow300*/ / TimeRate;
+                double preEmpt = 450/*HitObjectManager.PreEmpt*/ / TimeRate;
+
+                categoryDifficulty.Add("OD", (-(hitWindow300 - 80.0) / 6.0).ToString("0.00"));
+                categoryDifficulty.Add("AR", (preEmpt > 1200.0 ? -(preEmpt - 1800.0) / 120.0 : -(preEmpt - 1200.0) / 150.0 + 5.0).ToString("0.00"));
+
+                int maxCombo = 0;
+                foreach (OsuHitObjectDifficulty hitObject in DifficultyHitObjects)
+                    maxCombo += hitObject.MaxCombo;
+
+                categoryDifficulty.Add("Max combo", maxCombo.ToString());
+            }
+
+            // Again, from own observations and from the general opinion of the community a map with high speed and low aim (or vice versa) difficulty is harder,
+            // than a map with mediocre difficulty in both. Therefore we can not just add both difficulties together, but will introduce a scaling that favors extremes.
+            double starRating = speedStars + aimStars + Math.Abs(speedStars - aimStars) * extreme_scaling_factor;
+            // Another approach to this would be taking Speed and Aim separately to a chosen power, which again would be equivalent. This would be more convenient if
+            // the hit window size is to be considered as well.
+
+            // Note: The star rating is tuned extremely tight! Airman (/b/104229) and Freedom Dive (/b/126645), two of the hardest ranked maps, both score ~4.66 stars.
+            // Expect the easier kind of maps that officially get 5 stars to obtain around 2 by this metric. The tutorial still scores about half a star.
+            // Tune by yourself as you please. ;)
+
+            return starRating;
+        }
+
+        protected bool CalculateStrainValues()
+        {
+            // Traverse hitObjects in pairs to calculate the strain value of NextHitObject from the strain value of CurrentHitObject and environment.
+            List<OsuHitObjectDifficulty>.Enumerator hitObjectsEnumerator = DifficultyHitObjects.GetEnumerator();
+
+            if (!hitObjectsEnumerator.MoveNext()) return false;
+
+            OsuHitObjectDifficulty currentHitObject = hitObjectsEnumerator.Current;
+            OsuHitObjectDifficulty nextHitObject;
+
+            // First hitObject starts at strain 1. 1 is the default for strain values, so we don't need to set it here. See DifficultyHitObject.
+            while (hitObjectsEnumerator.MoveNext())
+            {
+                nextHitObject = hitObjectsEnumerator.Current;
+                nextHitObject.CalculateStrains(currentHitObject, TimeRate);
+                currentHitObject = nextHitObject;
+            }
+
+            return true;
+        }
+
+        /// <summary>
+        /// In milliseconds. For difficulty calculation we will only look at the highest strain value in each time interval of size STRAIN_STEP.
+        /// This is to eliminate higher influence of stream over aim by simply having more HitObjects with high strain.
+        /// The higher this value, the less strains there will be, indirectly giving long beatmaps an advantage.
+        /// </summary>
+        protected const double STRAIN_STEP = 400;
+
+        /// <summary>
+        /// The weighting of each strain value decays to this number * it's previous value
+        /// </summary>
+        protected const double DECAY_WEIGHT = 0.9;
+
+        protected double CalculateDifficulty(DifficultyType type)
+        {
+            double actualStrainStep = STRAIN_STEP * TimeRate;
+
+            // Find the highest strain value within each strain step
+            List<double> highestStrains = new List<double>();
+            double intervalEndTime = actualStrainStep;
+            double maximumStrain = 0; // We need to keep track of the maximum strain in the current interval
+
+            OsuHitObjectDifficulty previousHitObject = null;
+            foreach (OsuHitObjectDifficulty hitObject in DifficultyHitObjects)
+            {
+                // While we are beyond the current interval push the currently available maximum to our strain list
+                while (hitObject.BaseHitObject.StartTime > intervalEndTime)
+                {
+                    highestStrains.Add(maximumStrain);
+
+                    // The maximum strain of the next interval is not zero by default! We need to take the last hitObject we encountered, take its strain and apply the decay
+                    // until the beginning of the next interval.
+                    if (previousHitObject == null)
+                    {
+                        maximumStrain = 0;
+                    }
+                    else
+                    {
+                        double decay = Math.Pow(OsuHitObjectDifficulty.DECAY_BASE[(int)type], (intervalEndTime - previousHitObject.BaseHitObject.StartTime) / 1000);
+                        maximumStrain = previousHitObject.Strains[(int)type] * decay;
+                    }
+
+                    // Go to the next time interval
+                    intervalEndTime += actualStrainStep;
+                }
+
+                // Obtain maximum strain
+                maximumStrain = Math.Max(hitObject.Strains[(int)type], maximumStrain);
+
+                previousHitObject = hitObject;
+            }
+
+            // Build the weighted sum over the highest strains for each interval
+            double difficulty = 0;
+            double weight = 1;
+            highestStrains.Sort((a, b) => b.CompareTo(a)); // Sort from highest to lowest strain.
+
+            foreach (double strain in highestStrains)
+            {
+                difficulty += weight * strain;
+                weight *= DECAY_WEIGHT;
+            }
+
+            return difficulty;
+        }
+
+        // Those values are used as array indices. Be careful when changing them!
+        public enum DifficultyType : int
+        {
+            Speed = 0,
+            Aim,
+        };
+    }
+}
@@ -40,6 +40,8 @@ namespace osu.Game.Modes.Osu

        public override ScoreProcessor CreateScoreProcessor(int hitObjectCount) => new OsuScoreProcessor(hitObjectCount);

+        public override DifficultyCalculator CreateDifficultyCalculator(Beatmap beatmap) => new OsuDifficultyCalculator(beatmap);
+
        protected override PlayMode PlayMode => PlayMode.Osu;
    }
 }
@@ -1,12 +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 System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
 namespace osu.Game.Modes.Osu
 {
    class OsuScore : Score
@@ -2,7 +2,6 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

 // General Information about an assembly is controlled through the following 
@@ -3,7 +3,6 @@

 using osu.Game.Modes.UI;
 using OpenTK;
-using osu.Framework.Graphics.Primitives;

 namespace osu.Game.Modes.Osu.UI
 {
@@ -13,19 +13,21 @@ namespace osu.Game.Modes.Osu.UI
 {
    public class OsuScoreOverlay : ScoreOverlay
    {
-        protected override ScoreCounter CreateScoreCounter() => new ScoreCounter()
+        protected override ScoreCounter CreateScoreCounter() => new ScoreCounter(6)
        {
-            Anchor = Anchor.TopRight,
-            Origin = Anchor.TopRight,
-            TextSize = 60,
+            Anchor = Anchor.TopCentre,
+            Origin = Anchor.TopCentre,
+            TextSize = 40,
+            Position = new Vector2(0, 30),
            Margin = new MarginPadding { Right = 5 },
        };

        protected override PercentageCounter CreateAccuracyCounter() => new PercentageCounter()
        {
-            Anchor = Anchor.TopRight,
-            Origin = Anchor.TopRight,
-            Position = new Vector2(0, 55),
+            Anchor = Anchor.TopCentre,
+            Origin = Anchor.TopCentre,
+            Position = new Vector2(0, 65),
+            TextSize = 20,
            Margin = new MarginPadding { Right = 5 },
        };

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
@@ -7,9 +7,9 @@ Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/maste
  <runtime>
    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
      <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0"/>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /></startup></configuration>
@@ -34,7 +34,7 @@
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="OpenTK, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
-      <HintPath>..\packages\ppy.OpenTK.2.0.50727.1339\lib\net45\OpenTK.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.2.0.50727.1340\lib\net45\OpenTK.dll</HintPath>
      <Private>True</Private>
    </Reference>
    <Reference Include="System" />
@@ -66,9 +66,11 @@
    <Compile Include="Objects\Drawables\Pieces\TrianglesPiece.cs" />
    <Compile Include="Objects\Drawables\Pieces\SliderBall.cs" />
    <Compile Include="Objects\Drawables\Pieces\SliderBody.cs" />
+    <Compile Include="Objects\OsuHitObjectDifficulty.cs" />
    <Compile Include="Objects\OsuHitObjectParser.cs" />
    <Compile Include="Objects\SliderCurve.cs" />
    <Compile Include="Objects\SliderTick.cs" />
+    <Compile Include="OsuDifficultyCalculator.cs" />
    <Compile Include="OsuScore.cs" />
    <Compile Include="OsuScoreProcessor.cs" />
    <Compile Include="UI\OsuComboCounter.cs" />
@@ -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.1339" targetFramework="net452" />
+  <package id="ppy.OpenTK" version="2.0.50727.1340" targetFramework="net45" />
 </packages>
@@ -5,7 +5,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
-using osu.Framework.Graphics.Transformations;
+using osu.Framework.Graphics.Transforms;
 using OpenTK;

 namespace osu.Game.Modes.Taiko.Objects.Drawable
@@ -2,7 +2,6 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

 // General Information about an assembly is controlled through the following 
@@ -0,0 +1,27 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Beatmaps;
+using osu.Game.Modes.Objects;
+using osu.Game.Modes.Taiko.Objects;
+using System;
+using System.Collections.Generic;
+
+namespace osu.Game.Modes.Taiko
+{
+    public class TaikoDifficultyCalculator : DifficultyCalculator<TaikoBaseHit>
+    {
+        protected override PlayMode PlayMode => PlayMode.Taiko;
+
+        public TaikoDifficultyCalculator(Beatmap beatmap) : base(beatmap)
+        {
+        }
+
+        protected override HitObjectConverter<TaikoBaseHit> Converter => new TaikoConverter();
+
+        protected override double CalculateInternal(Dictionary<String, String> categoryDifficulty)
+        {
+            return 0;
+        }
+    }
+}
@@ -1,11 +1,8 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

-using System;
-using System.Collections.Generic;
 using osu.Game.Graphics;
 using osu.Game.Modes.Objects;
-using osu.Game.Modes.Osu.Objects;
 using osu.Game.Modes.Osu.UI;
 using osu.Game.Modes.Taiko.UI;
 using osu.Game.Modes.UI;
@@ -26,5 +23,7 @@ namespace osu.Game.Modes.Taiko
        public override ScoreProcessor CreateScoreProcessor(int hitObjectCount) => null;

        public override HitObjectParser CreateHitObjectParser() => new NullHitObjectParser();
+
+        public override DifficultyCalculator CreateDifficultyCalculator(Beatmap beatmap) => new TaikoDifficultyCalculator(beatmap);
    }
 }
@@ -1,7 +1,7 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

-using osu.Framework.Graphics.Transformations;
+using osu.Framework.Graphics.Transforms;
 using osu.Game.Modes.UI;
 using OpenTK;

@@ -33,7 +33,7 @@
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="OpenTK, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
-      <HintPath>..\packages\ppy.OpenTK.2.0.50727.1339\lib\net45\OpenTK.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.2.0.50727.1340\lib\net45\OpenTK.dll</HintPath>
      <Private>True</Private>
    </Reference>
    <Reference Include="System" />
@@ -47,6 +47,7 @@
    <Reference Include="System.Xml" />
  </ItemGroup>
  <ItemGroup>
+    <Compile Include="TaikoDifficultyCalculator.cs" />
    <Compile Include="Objects\Drawable\DrawableTaikoHit.cs" />
    <Compile Include="Objects\TaikoBaseHit.cs" />
    <Compile Include="Objects\TaikoConverter.cs" />
@@ -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.1339" targetFramework="net45" />
+  <package id="ppy.OpenTK" version="2.0.50727.1340" targetFramework="net45" />
 </packages>
@@ -1,18 +1,15 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE

-using System;
 using System.IO;
 using NUnit.Framework;
 using OpenTK;
 using OpenTK.Graphics;
-using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Formats;
 using osu.Game.Beatmaps.Samples;
 using osu.Game.Modes;
 using osu.Game.Modes.Osu;
 using osu.Game.Modes.Osu.Objects;
-using osu.Game.Screens.Play;
 using osu.Game.Tests.Resources;

 namespace osu.Game.Tests.Beatmaps.Formats
@@ -3,9 +3,9 @@

 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Threading;
+using System.Threading.Tasks;
 using NUnit.Framework;
 using osu.Framework.Desktop.Platform;
 using osu.Framework.Platform;
@@ -16,7 +16,6 @@ using osu.Game.Modes.Catch;
 using osu.Game.Modes.Mania;
 using osu.Game.Modes.Osu;
 using osu.Game.Modes.Taiko;
-using osu.Game.Screens.Play;

 namespace osu.Game.Tests.Beatmaps.IO
 {
@@ -58,17 +57,17 @@ namespace osu.Game.Tests.Beatmaps.IO
                var osu = loadOsu(host);

                var importer = new BeatmapImporter(client);
-                if (!importer.Import(osz_path).Wait(1000))
+                if (!importer.ImportAsync(osz_path).Wait(1000))
                    Assert.Fail(@"IPC took too long to send");

-                ensureLoaded(osu, 10000);
+                ensureLoaded(osu);
            }
        }

-        private OsuGameBase loadOsu(BasicGameHost host)
+        private OsuGameBase loadOsu(GameHost host)
        {
            var osu = new OsuGameBase();
-            host.Add(osu);
+            Task.Run(() => host.Run(osu));

            while (!osu.IsLoaded)
                Thread.Sleep(1);
@@ -79,23 +78,23 @@ namespace osu.Game.Tests.Beatmaps.IO
            return osu;
        }

-        private void ensureLoaded(OsuGameBase osu, int timeout = 100)
+        private void ensureLoaded(OsuGameBase osu, int timeout = 10000)
        {
            IEnumerable<BeatmapSetInfo> resultSets = null;

            Action waitAction = () =>
            {
                while ((resultSets = osu.Dependencies.Get<BeatmapDatabase>()
-                    .Query<BeatmapSetInfo>().Where(s => s.OnlineBeatmapSetID == 241526)).Count() != 1)
-                    Thread.Sleep(1);
+                    .Query<BeatmapSetInfo>().Where(s => s.OnlineBeatmapSetID == 241526)).Count() == 0)
+                    Thread.Sleep(50);
            };

            Assert.IsTrue(waitAction.BeginInvoke(null, null).AsyncWaitHandle.WaitOne(timeout),
-                @"BeatmapSet did not import to the database");
+                $@"BeatmapSet did not import to the database in allocated time.");

            //ensure we were stored to beatmap database backing...

-            Assert.IsTrue(resultSets.Count() == 1);
+            Assert.IsTrue(resultSets.Count() == 1, $@"Incorrect result count found ({resultSets.Count()} but should be 1).");

            IEnumerable<BeatmapInfo> resultBeatmaps = null;

@@ -104,23 +103,24 @@ namespace osu.Game.Tests.Beatmaps.IO
            {
                while ((resultBeatmaps = osu.Dependencies.Get<BeatmapDatabase>()
                    .Query<BeatmapInfo>().Where(s => s.OnlineBeatmapSetID == 241526 && s.BaseDifficultyID > 0)).Count() != 12)
-                    Thread.Sleep(1);
+                    Thread.Sleep(50);
            };

            Assert.IsTrue(waitAction.BeginInvoke(null, null).AsyncWaitHandle.WaitOne(timeout),
-                @"Beatmaps did not import to the database");
+                @"Beatmaps did not import to the database in allocated time");

            //fetch children and check we can load from the post-storage path...
            var set = osu.Dependencies.Get<BeatmapDatabase>().GetChildren(resultSets.First());

-            Assert.IsTrue(set.Beatmaps.Count == resultBeatmaps.Count());
+            Assert.IsTrue(set.Beatmaps.Count == resultBeatmaps.Count(),
+                $@"Incorrect database beatmap count post-import ({resultBeatmaps.Count()} but should be {set.Beatmaps.Count}).");

            foreach (BeatmapInfo b in resultBeatmaps)
                Assert.IsTrue(set.Beatmaps.Any(c => c.OnlineBeatmapID == b.OnlineBeatmapID));

            Assert.IsTrue(set.Beatmaps.Count > 0);

-            var beatmap = osu.Dependencies.Get<BeatmapDatabase>().GetBeatmap(set.Beatmaps.First(b => b.Mode == PlayMode.Osu));
+            var beatmap = osu.Dependencies.Get<BeatmapDatabase>().GetWorkingBeatmap(set.Beatmaps.First(b => b.Mode == PlayMode.Osu))?.Beatmap;

            Assert.IsTrue(beatmap.HitObjects.Count > 0);
        }
@@ -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 System.IO;
 using NUnit.Framework;
 using osu.Game.Beatmaps.IO;
@@ -33,17 +33,15 @@
      <HintPath>$(SolutionDir)\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll</HintPath>
      <Private>True</Private>
    </Reference>
+    <Reference Include="OpenTK, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\ppy.OpenTK.2.0.50727.1340\lib\net45\OpenTK.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
    <Reference Include="System" />
    <Reference Include="nunit.framework">
      <HintPath>$(SolutionDir)\packages\NUnit.3.5.0\lib\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.1339\lib\net45\OpenTK.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
    <Reference Include="System" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Xml" />
    <Reference Include="SQLite.Net">
      <HintPath>$(SolutionDir)\packages\SQLite.Net.Core-PCL.3.1.1\lib\portable-win8+net45+wp8+wpa81+MonoAndroid1+MonoTouch1\SQLite.Net.dll</HintPath>
    </Reference>
@@ -1,11 +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.1339" 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>
+<?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="SQLite.Net.Core-PCL" version="3.1.1" targetFramework="net45" />
+  <package id="SQLite.Net-PCL" version="3.1.1" targetFramework="net45" />
+</packages>
@@ -7,6 +7,7 @@ using OpenTK.Graphics;
 using osu.Game.Beatmaps.Timing;
 using osu.Game.Database;
 using osu.Game.Modes.Objects;
+using osu.Game.Modes;

 namespace osu.Game.Beatmaps
 {
@@ -17,8 +18,8 @@ namespace osu.Game.Beatmaps
        public List<HitObject> HitObjects { get; set; }
        public List<ControlPoint> ControlPoints { get; set; }
        public List<Color4> ComboColors { get; set; }
-        public double BPMMaximum => 60000 / ControlPoints.Where(c => c.BeatLength != 0).OrderBy(c => c.BeatLength).First().BeatLength;
-        public double BPMMinimum => 60000 / ControlPoints.Where(c => c.BeatLength != 0).OrderByDescending(c => c.BeatLength).First().BeatLength;
+        public double BPMMaximum => 60000 / (ControlPoints?.Where(c => c.BeatLength != 0).OrderBy(c => c.BeatLength).FirstOrDefault() ?? ControlPoint.Default).BeatLength;
+        public double BPMMinimum => 60000 / (ControlPoints?.Where(c => c.BeatLength != 0).OrderByDescending(c => c.BeatLength).FirstOrDefault() ?? ControlPoint.Default).BeatLength;
        public double BPMMode => BPMAt(ControlPoints.Where(c => c.BeatLength != 0).GroupBy(c => c.BeatLength).OrderByDescending(grp => grp.Count()).First().First().Time);

        public double BPMAt(double time)
@@ -39,7 +40,11 @@ namespace osu.Game.Beatmaps

            ControlPoint timingPoint = null;
            foreach (var controlPoint in ControlPoints)
-                if (controlPoint.Time <= time)
+            {
+                // Some beatmaps have the first timingPoint (accidentally) start after the first HitObject(s).
+                // This null check makes it so that the first ControlPoint that makes a timing change is used as
+                // the timingPoint for those HitObject(s).
+                if (controlPoint.Time <= time || timingPoint == null)
                {
                    if (controlPoint.TimingChange)
                    {
@@ -49,8 +54,11 @@ namespace osu.Game.Beatmaps
                    else overridePoint = controlPoint;
                }
                else break;
+            }

-            return timingPoint;
+            return timingPoint ?? ControlPoint.Default;
        }
+
+        public double CalculateStarDifficulty() => Ruleset.GetRuleset(BeatmapInfo.Mode).CreateDifficultyCalculator(this).Calculate();
    }
 }
@@ -0,0 +1,50 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Game.Modes;
+using osu.Game.Modes.Objects;
+using System;
+using System.Collections.Generic;
+
+namespace osu.Game.Beatmaps
+{
+    public abstract class DifficultyCalculator
+    {
+        protected abstract PlayMode PlayMode { get; }
+
+        protected double TimeRate = 1;
+
+        protected abstract double CalculateInternal(Dictionary<String, String> categoryDifficulty);
+
+        private void loadTiming()
+        {
+            // TODO: Handle mods
+            int audioRate = 100;
+            TimeRate = audioRate / 100.0;
+        }
+
+        public double Calculate(Dictionary<string, string> categoryDifficulty = null)
+        {
+            loadTiming();
+            double difficulty = CalculateInternal(categoryDifficulty);
+            return difficulty;
+        }
+    }
+
+    public abstract class DifficultyCalculator<T> : DifficultyCalculator where T : HitObject
+    {
+        protected List<T> Objects;
+
+        protected abstract HitObjectConverter<T> Converter { get; }
+
+        public DifficultyCalculator(Beatmap beatmap)
+        {
+            Objects = Converter.Convert(beatmap);
+            PreprocessHitObjects();
+        }
+
+        protected virtual void PreprocessHitObjects()
+        {
+        }
+    }
+}
@@ -16,7 +16,7 @@ namespace osu.Game.Beatmaps.Drawables
        }

        [BackgroundDependencyLoader]
-        private void load(OsuGameBase game)
+        private void load()
        {
            if (working.Background != null)
                Texture = working.Background;
@@ -6,7 +6,6 @@ using System.Collections.Generic;
 using System.Linq;
 using osu.Framework;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Transformations;
 using osu.Game.Database;

 namespace osu.Game.Beatmaps.Drawables
@@ -60,15 +59,21 @@ namespace osu.Game.Beatmaps.Drawables
            }
        }

-        public BeatmapGroup(WorkingBeatmap beatmap, BeatmapSetInfo set = null)
+        public BeatmapGroup(BeatmapSetInfo beatmapSet, BeatmapDatabase database)
        {
+            BeatmapSet = beatmapSet;
+            WorkingBeatmap beatmap = database.GetWorkingBeatmap(BeatmapSet.Beatmaps.FirstOrDefault());
+            foreach (var b in BeatmapSet.Beatmaps)
+                b.StarDifficulty = (float)(database.GetWorkingBeatmap(b).Beatmap?.CalculateStarDifficulty() ?? -1f);
+
            Header = new BeatmapSetHeader(beatmap)
            {
                GainedSelection = headerGainedSelection,
                RelativeSizeAxes = Axes.X,
            };
-
-            BeatmapPanels = beatmap.BeatmapSetInfo.Beatmaps.Select(b => new BeatmapPanel(b)
+            
+            BeatmapSet.Beatmaps = BeatmapSet.Beatmaps.OrderBy(b => b.StarDifficulty).ToList();
+            BeatmapPanels = BeatmapSet.Beatmaps.Select(b => new BeatmapPanel(b)
            {
                Alpha = 0,
                GainedSelection = panelGainedSelection,
@@ -76,7 +81,6 @@ namespace osu.Game.Beatmaps.Drawables
                RelativeSizeAxes = Axes.X,
            }).ToList();

-            BeatmapSet = set;
            Header.AddDifficultyIcons(BeatmapPanels);
        }

@@ -26,6 +26,7 @@ namespace osu.Game.Beatmaps.Drawables
        public Action<BeatmapPanel> GainedSelection;
        public Action<BeatmapPanel> StartRequested;
        private Triangles triangles;
+        private StarCounter starCounter;

        protected override void Selected()
        {
@@ -56,6 +57,14 @@ namespace osu.Game.Beatmaps.Drawables
            return base.OnClick(state);
        }

+        protected override void ApplyState(PanelSelectedState last = PanelSelectedState.Hidden)
+        {
+            base.ApplyState(last);
+
+            if (last == PanelSelectedState.Hidden && State != last)
+                starCounter.ReplayAnimation();
+        }
+
        public BeatmapPanel(BeatmapInfo beatmap)
        {
            Beatmap = beatmap;
@@ -74,10 +83,10 @@ namespace osu.Game.Beatmaps.Drawables
                    ColourLight = OsuColour.FromHex(@"3a7285"),
                    ColourDark = OsuColour.FromHex(@"123744")
                },
-                new FlowContainer
+                new FillFlowContainer
                {
                    Padding = new MarginPadding(5),
-                    Direction = FlowDirections.Horizontal,
+                    Direction = FillDirection.Right,
                    AutoSizeAxes = Axes.Both,
                    Anchor = Anchor.CentreLeft,
                    Origin = Anchor.CentreLeft,
@@ -89,19 +98,18 @@ namespace osu.Game.Beatmaps.Drawables
                            Anchor = Anchor.CentreLeft,
                            Origin = Anchor.CentreLeft,
                        },
-                        new FlowContainer
+                        new FillFlowContainer
                        {
                            Padding = new MarginPadding { Left = 5 },
-                            Spacing = new Vector2(0, 5),
-                            Direction = FlowDirections.Vertical,
+                            Direction = FillDirection.Down,
                            AutoSizeAxes = Axes.Both,
                            Children = new Drawable[]
                            {
-                                new FlowContainer
+                                new FillFlowContainer
                                {
-                                    Direction = FlowDirections.Horizontal,
-                                    AutoSizeAxes = Axes.Both,
+                                    Direction = FillDirection.Right,
                                    Spacing = new Vector2(4, 0),
+                                    AutoSizeAxes = Axes.Both,
                                    Children = new[]
                                    {
                                        new OsuSpriteText
@@ -130,7 +138,11 @@ namespace osu.Game.Beatmaps.Drawables
                                        },
                                    }
                                },
-                                new StarCounter { Count = beatmap.StarDifficulty, StarSize = 8 }
+                                starCounter = new StarCounter
+                                {
+                                    Count = beatmap.StarDifficulty,
+                                    Scale = new Vector2(0.8f),
+                                }
                            }
                        }
                    }
@@ -11,7 +11,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Configuration;
-using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using OpenTK;
 using OpenTK.Graphics;
@@ -25,7 +24,7 @@ namespace osu.Game.Beatmaps.Drawables
        private OsuConfigManager config;
        private Bindable<bool> preferUnicode;
        private WorkingBeatmap beatmap;
-        private FlowContainer difficultyIcons;
+        private FillFlowContainer difficultyIcons;

        public BeatmapSetHeader(WorkingBeatmap beatmap)
        {
@@ -37,9 +36,9 @@ namespace osu.Game.Beatmaps.Drawables
                {
                    RelativeSizeAxes = Axes.Both,
                },
-                new FlowContainer
+                new FillFlowContainer
                {
-                    Direction = FlowDirections.Vertical,
+                    Direction = FillDirection.Down,
                    Padding = new MarginPadding { Top = 5, Left = 18, Right = 10, Bottom = 10 },
                    AutoSizeAxes = Axes.Both,
                    Children = new[]
@@ -59,7 +58,7 @@ namespace osu.Game.Beatmaps.Drawables
                            TextSize = 17,
                            Shadow = true,
                        },
-                        difficultyIcons = new FlowContainer
+                        difficultyIcons = new FillFlowContainer
                        {
                            Margin = new MarginPadding { Top = 5 },
                            AutoSizeAxes = Axes.Both,
@@ -110,10 +109,10 @@ namespace osu.Game.Beatmaps.Drawables

                Children = new[]
                {
-                    new FlowContainer
+                    new FillFlowContainer
                    {
                        Depth = -1,
-                        Direction = FlowDirections.Horizontal,
+                        Direction = FillDirection.Right,
                        RelativeSizeAxes = Axes.Both,
                        // This makes the gradient not be perfectly horizontal, but diagonal at a ~40° angle
                        Shear = new Vector2(0.8f, 0),
@@ -162,7 +161,7 @@ namespace osu.Game.Beatmaps.Drawables
                    Anchor = Anchor.Centre,
                    Origin = Anchor.Centre,
                    FillMode = FillMode.Fill,
-                }.Preload(game, (bg) =>
+                }.LoadAsync(game, (bg) =>
                {
                    Add(bg);
                    ForceRedraw();
--- a/Show More
+++ b/Show More