Merge remote-tracking branch 'origin/open-downloaded-beatmas' into release

README.md

@@ -24,7 +24,7 @@ Clone the repository including submodules
 Build and run
 
 - Using Visual Studio 2017, Rider or Visual Studio Code (configurations are included)
-- From command line using `dotnet run --project osu.Desktop`
+- From command line using `dotnet run --project osu.Desktop --framework netcoreapp2.1`
 
 If you run into issues building you may need to restore nuget packages (commonly via `dotnet restore`). Visual Studio Code users must run `Restore` task from debug tab before attempt to build.
 

appveyor.yml

@@ -9,10 +9,12 @@ install:
   - cmd: git submodule update --init --recursive --depth=5
   - cmd: choco install resharper-clt -y
   - cmd: choco install nvika -y
-  - cmd: dotnet tool install CodeFileSanity --version 0.0.16 --global
+  - cmd: appveyor DownloadFile https://github.com/peppy/CodeFileSanity/releases/download/v0.2.5/CodeFileSanity.exe
 before_build:
-  - cmd: CodeFileSanity
+  - cmd: CodeFileSanity.exe
   - cmd: nuget restore -verbosity quiet
+environment:
+  TargetFramework: net471
 build:
   project: osu.sln
   parallel: true

appveyor_deploy.yml

@@ -16,15 +16,17 @@ build_script:
   - cd osu-deploy
   - nuget restore -verbosity quiet
   - msbuild osu.Desktop.Deploy.csproj
-  - cmd: ..\appveyor-tools\secure-file -decrypt ..\fdc6f19b04.enc -secret %decode_secret% -out bin\Debug\netcoreapp2.1\osu.Desktop.Deploy.dll.config
-  - dotnet bin/Debug/netcoreapp2.1/osu.Desktop.Deploy.dll %code_signing_password% %APPVEYOR_REPO_TAG_NAME%
+  - cmd: ..\appveyor-tools\secure-file -decrypt ..\fdc6f19b04.enc -secret %decode_secret% -out bin\Debug\net471\osu.Desktop.Deploy.exe.config
+  - cd bin\Debug\net471\
+  - osu.Desktop.Deploy.exe %code_signing_password% %APPVEYOR_REPO_TAG_NAME%
 environment:
+  TargetFramework: net471
   decode_secret:
     secure: i67IC2xj6DjjxmA6Oj2jing3+MwzLkq6CbGsjfZ7rdY=
   code_signing_password:
     secure: 34tLNqvjmmZEi97MLKfrnQ==
 artifacts:
-  - path: 'osu-deploy/releases/*'
+  - path: 'Releases\*'
 deploy:
   - provider: Environment
     name: github

osu.Desktop/OsuGameDesktop.cs

@@ -13,7 +13,6 @@ using osu.Game;
 using OpenTK.Input;
 using Microsoft.Win32;
 using osu.Desktop.Updater;
-using osu.Framework;
 using osu.Framework.Platform.Windows;
 
 namespace osu.Desktop
@@ -52,10 +51,11 @@ namespace osu.Desktop
                     v.State = Visibility.Visible;
                 });
 
-                if (RuntimeInfo.OS == RuntimeInfo.Platform.Windows)
-                    Add(new SquirrelUpdateManager());
-                else
-                    Add(new SimpleUpdateManager());
+#if NET_FRAMEWORK
+                Add(new SquirrelUpdateManager());
+#else
+                Add(new SimpleUpdateManager());
+#endif
             }
         }
 

osu.Desktop/Program.cs

@@ -8,6 +8,10 @@ using osu.Framework;
 using osu.Framework.Platform;
 using osu.Game.IPC;
 
+#if NET_FRAMEWORK
+using System.Runtime;
+#endif
+
 namespace osu.Desktop
 {
     public static class Program
@@ -15,6 +19,8 @@ namespace osu.Desktop
         [STAThread]
         public static int Main(string[] args)
         {
+            useMultiCoreJit();
+
             // Back up the cwd before DesktopGameHost changes it
             var cwd = Environment.CurrentDirectory;
 
@@ -45,5 +51,14 @@ namespace osu.Desktop
                 return 0;
             }
         }
+
+        private static void useMultiCoreJit()
+        {
+#if NET_FRAMEWORK
+            var directory = Directory.CreateDirectory(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Profiles"));
+            ProfileOptimization.SetProfileRoot(directory.FullName);
+            ProfileOptimization.StartProfile("Startup.Profile");
+#endif
+        }
     }
 }

osu.Desktop/Updater/SquirrelUpdateManager.cs

@@ -1,6 +1,7 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+#if NET_FRAMEWORK
 using System;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
@@ -161,3 +162,4 @@ namespace osu.Desktop.Updater
         }
     }
 }
+#endif

osu.Desktop/osu.Desktop.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\osu.Game.props" />
   <PropertyGroup Label="Project">
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFrameworks>net471;netcoreapp2.1</TargetFrameworks>
     <OutputType>WinExe</OutputType>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -13,6 +13,9 @@
     <Version>0.0.0</Version>
     <FileVersion>0.0.0</FileVersion>
   </PropertyGroup>
+  <PropertyGroup Label="Defines">
+    <DefineConstants Condition="'$(TargetFramework)' == 'net471'">$(DefineConstants);NET_FRAMEWORK</DefineConstants>
+  </PropertyGroup>
   <PropertyGroup>
     <StartupObject>osu.Desktop.Program</StartupObject>
   </PropertyGroup>
@@ -26,12 +29,11 @@
     <PackageReference Include="Microsoft.Win32.Registry" Version="4.5.0" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="System.IO.Packaging" Version="4.5.0" />
-    <PackageReference Include="ppy.squirrel.windows" Version="1.8.0.3" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.1" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.1.1" />
+    <PackageReference Include="squirrel.windows" Version="1.8.0" Condition="'$(TargetFramework)' == 'net471'" />
   </ItemGroup>
   <ItemGroup Label="Resources">
     <EmbeddedResource Include="lazer.ico" />
   </ItemGroup>
-</Project>
+</Project>

osu.Desktop/osu.nuspec

@@ -3,7 +3,7 @@
     <metadata>
         <id>osulazer</id>
         <version>0.0.0</version>
-        <title>osu!lazer</title>
+        <title>osulazer</title>
         <authors>ppy Pty Ltd</authors>
         <owners>Dean Herbert</owners>
         <projectUrl>https://osu.ppy.sh/</projectUrl>

osu.Game.Rulesets.Catch.Tests/.vscode/launch.json

@@ -2,7 +2,35 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "VisualTests (Debug)",
+            "name": "VisualTests (Debug, net471)",
+            "windows": {
+                "type": "clr"
+            },
+            "type": "mono",
+            "request": "launch",
+            "program": "${workspaceRoot}/bin/Debug/net471/osu.Game.Rulesets.Catch.Tests.exe",
+            "cwd": "${workspaceRoot}",
+            "preLaunchTask": "Build (Debug, msbuild)",
+            "runtimeExecutable": null,
+            "env": {},
+            "console": "internalConsole"
+        },
+        {
+            "name": "VisualTests (Release, net471)",
+            "windows": {
+                "type": "clr"
+            },
+            "type": "mono",
+            "request": "launch",
+            "program": "${workspaceRoot}/bin/Release/net471/osu.Game.Rulesets.Catch.Tests.exe",
+            "cwd": "${workspaceRoot}",
+            "preLaunchTask": "Build (Release, msbuild)",
+            "runtimeExecutable": null,
+            "env": {},
+            "console": "internalConsole"
+        },
+        {
+            "name": "VisualTests (Debug, netcoreapp2.1)",
             "type": "coreclr",
             "request": "launch",
             "program": "dotnet",
@@ -10,12 +38,12 @@
                 "${workspaceRoot}/bin/Debug/netcoreapp2.1/osu.Game.Rulesets.Catch.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
-            "preLaunchTask": "Build (Debug)",
+            "preLaunchTask": "Build (Debug, dotnet)",
             "env": {},
             "console": "internalConsole"
         },
         {
-            "name": "VisualTests (Release)",
+            "name": "VisualTests (Release, netcoreapp2.1)",
             "type": "coreclr",
             "request": "launch",
             "program": "dotnet",
@@ -23,7 +51,7 @@
                 "${workspaceRoot}/bin/Release/netcoreapp2.1/osu.Game.Rulesets.Catch.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
-            "preLaunchTask": "Build (Release)",
+            "preLaunchTask": "Build (Release, dotnet)",
             "env": {},
             "console": "internalConsole"
         }

osu.Game.Rulesets.Catch.Tests/.vscode/tasks.json

@@ -4,13 +4,12 @@
     "version": "2.0.0",
     "tasks": [
         {
-            "label": "Build (Debug)",
+            "label": "Build (Debug, msbuild)",
             "type": "shell",
-            "command": "dotnet",
+            "command": "msbuild",
             "args": [
-                "build",
-                "--no-restore",
                 "osu.Game.Rulesets.Catch.Tests.csproj",
+                "/p:TargetFramework=net471",
                 "/p:GenerateFullPaths=true",
                 "/m",
                 "/verbosity:m"
@@ -19,13 +18,45 @@
             "problemMatcher": "$msCompile"
         },
         {
-            "label": "Build (Release)",
+            "label": "Build (Release, msbuild)",
+            "type": "shell",
+            "command": "msbuild",
+            "args": [
+                "osu.Game.Rulesets.Catch.Tests.csproj",
+                "/p:Configuration=Release",
+                "/p:TargetFramework=net471",
+                "/p:GenerateFullPaths=true",
+                "/m",
+                "/verbosity:m"
+            ],
+            "group": "build",
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "Build (Debug, dotnet)",
             "type": "shell",
             "command": "dotnet",
             "args": [
                 "build",
                 "--no-restore",
                 "osu.Game.Rulesets.Catch.Tests.csproj",
+                "/p:TargetFramework=netcoreapp2.1",
+                "/p:GenerateFullPaths=true",
+                "/m",
+                "/verbosity:m"
+            ],
+            "group": "build",
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "Build (Release, dotnet)",
+            "type": "shell",
+            "command": "dotnet",
+            "args": [
+                "build",
+                "--no-restore",
+                "osu.Game.Rulesets.Catch.Tests.csproj",
+                "/p:TargetFramework=netcoreapp2.1",
                 "/p:Configuration=Release",
                 "/p:GenerateFullPaths=true",
                 "/m",
@@ -35,7 +66,16 @@
             "problemMatcher": "$msCompile"
         },
         {
-            "label": "Restore",
+            "label": "Restore (net471)",
+            "type": "shell",
+            "command": "nuget",
+            "args": [
+                "restore"
+            ],
+            "problemMatcher": []
+        },
+        {
+            "label": "Restore (netcoreapp2.1)",
             "type": "shell",
             "command": "dotnet",
             "args": [

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

@@ -1,14 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\osu.TestProject.props" />
-  <ItemGroup Label="Package References">
-    <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
-    <PackageReference Include="NUnit" Version="3.10.1" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
-  </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFrameworks>netcoreapp2.1;net471</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup Label="Project References">
     <ProjectReference Include="..\osu.Game.Rulesets.Catch\osu.Game.Rulesets.Catch.csproj" />

osu.Game.Rulesets.Catch/CatchRuleset.cs

@@ -93,11 +93,13 @@ namespace osu.Game.Rulesets.Catch
                         new CatchModHidden(),
                         new CatchModFlashlight(),
                     };
-                case ModType.Automation:
+                case ModType.Special:
                     return new Mod[]
                     {
-                        new MultiMod(new CatchModAutoplay(), new ModCinema()),
                         new CatchModRelax(),
+                        null,
+                        null,
+                        new MultiMod(new CatchModAutoplay(), new ModCinema()),
                     };
                 default:
                     return new Mod[] { };

osu.Game.Rulesets.Mania.Tests/.vscode/launch.json

@@ -2,7 +2,35 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "VisualTests (Debug)",
+            "name": "VisualTests (Debug, net471)",
+            "windows": {
+                "type": "clr"
+            },
+            "type": "mono",
+            "request": "launch",
+            "program": "${workspaceRoot}/bin/Debug/net471/osu.Game.Rulesets.Mania.Tests.exe",
+            "cwd": "${workspaceRoot}",
+            "preLaunchTask": "Build (Debug, msbuild)",
+            "runtimeExecutable": null,
+            "env": {},
+            "console": "internalConsole"
+        },
+        {
+            "name": "VisualTests (Release, net471)",
+            "windows": {
+                "type": "clr"
+            },
+            "type": "mono",
+            "request": "launch",
+            "program": "${workspaceRoot}/bin/Release/net471/osu.Game.Rulesets.Mania.Tests.exe",
+            "cwd": "${workspaceRoot}",
+            "preLaunchTask": "Build (Release, msbuild)",
+            "runtimeExecutable": null,
+            "env": {},
+            "console": "internalConsole"
+        },
+        {
+            "name": "VisualTests (Debug, netcoreapp2.1)",
             "type": "coreclr",
             "request": "launch",
             "program": "dotnet",
@@ -10,12 +38,12 @@
                 "${workspaceRoot}/bin/Debug/netcoreapp2.1/osu.Game.Rulesets.Mania.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
-            "preLaunchTask": "Build (Debug)",
+            "preLaunchTask": "Build (Debug, dotnet)",
             "env": {},
             "console": "internalConsole"
         },
         {
-            "name": "VisualTests (Release)",
+            "name": "VisualTests (Release, netcoreapp2.1)",
             "type": "coreclr",
             "request": "launch",
             "program": "dotnet",
@@ -23,7 +51,7 @@
                 "${workspaceRoot}/bin/Release/netcoreapp2.1/osu.Game.Rulesets.Mania.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
-            "preLaunchTask": "Build (Release)",
+            "preLaunchTask": "Build (Release, dotnet)",
             "env": {},
             "console": "internalConsole"
         }

osu.Game.Rulesets.Mania.Tests/.vscode/tasks.json

@@ -4,13 +4,12 @@
     "version": "2.0.0",
     "tasks": [
         {
-            "label": "Build (Debug)",
+            "label": "Build (Debug, msbuild)",
             "type": "shell",
-            "command": "dotnet",
+            "command": "msbuild",
             "args": [
-                "build",
-                "--no-restore",
                 "osu.Game.Rulesets.Mania.Tests.csproj",
+                "/p:TargetFramework=net471",
                 "/p:GenerateFullPaths=true",
                 "/m",
                 "/verbosity:m"
@@ -19,13 +18,45 @@
             "problemMatcher": "$msCompile"
         },
         {
-            "label": "Build (Release)",
+            "label": "Build (Release, msbuild)",
+            "type": "shell",
+            "command": "msbuild",
+            "args": [
+                "osu.Game.Rulesets.Mania.Tests.csproj",
+                "/p:Configuration=Release",
+                "/p:TargetFramework=net471",
+                "/p:GenerateFullPaths=true",
+                "/m",
+                "/verbosity:m"
+            ],
+            "group": "build",
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "Build (Debug, dotnet)",
             "type": "shell",
             "command": "dotnet",
             "args": [
                 "build",
                 "--no-restore",
                 "osu.Game.Rulesets.Mania.Tests.csproj",
+                "/p:TargetFramework=netcoreapp2.1",
+                "/p:GenerateFullPaths=true",
+                "/m",
+                "/verbosity:m"
+            ],
+            "group": "build",
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "Build (Release, dotnet)",
+            "type": "shell",
+            "command": "dotnet",
+            "args": [
+                "build",
+                "--no-restore",
+                "osu.Game.Rulesets.Mania.Tests.csproj",
+                "/p:TargetFramework=netcoreapp2.1",
                 "/p:Configuration=Release",
                 "/p:GenerateFullPaths=true",
                 "/m",
@@ -35,7 +66,16 @@
             "problemMatcher": "$msCompile"
         },
         {
-            "label": "Restore",
+            "label": "Restore (net471)",
+            "type": "shell",
+            "command": "nuget",
+            "args": [
+                "restore"
+            ],
+            "problemMatcher": []
+        },
+        {
+            "label": "Restore (netcoreapp2.1)",
             "type": "shell",
             "command": "dotnet",
             "args": [

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

@@ -1,14 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\osu.TestProject.props" />
-  <ItemGroup Label="Package References">
-    <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
-    <PackageReference Include="NUnit" Version="3.10.1" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
-  </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFrameworks>netcoreapp2.1;net471</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup Label="Project References">
     <ProjectReference Include="..\osu.Game.Rulesets.Mania\osu.Game.Rulesets.Mania.csproj" />

osu.Game.Rulesets.Mania/ManiaRuleset.cs

@@ -120,7 +120,7 @@ namespace osu.Game.Rulesets.Mania
                         new MultiMod(new ManiaModFadeIn(), new ManiaModHidden()),
                         new ManiaModFlashlight(),
                     };
-                case ModType.Conversion:
+                case ModType.Special:
                     return new Mod[]
                     {
                         new MultiMod(new ManiaModKey4(),
@@ -135,10 +135,6 @@ namespace osu.Game.Rulesets.Mania
                         new ManiaModRandom(),
                         new ManiaModDualStages(),
                         new ManiaModMirror(),
-                    };
-                case ModType.Automation:
-                    return new Mod[]
-                    {
                         new MultiMod(new ManiaModAutoplay(), new ModCinema()),
                     };
                 default:

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

@@ -13,7 +13,6 @@ namespace osu.Game.Rulesets.Mania.Mods
     {
         public override string ShortenedName => Name;
         public abstract int KeyCount { get; }
-        public override ModType Type => ModType.Conversion;
         public override double ScoreMultiplier => 1; // TODO: Implement the mania key mod score multiplier
         public override bool Ranked => true;
 

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

@@ -16,7 +16,6 @@ namespace osu.Game.Rulesets.Mania.Mods
         public override string Name => "Dual Stages";
         public override string ShortenedName => "DS";
         public override string Description => @"Double the stages, double the fun!";
-        public override ModType Type => ModType.Conversion;
         public override double ScoreMultiplier => 1;
 
         private bool isForCurrentRuleset;

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

@@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Mania.Mods
     {
         public override string Name => "Mirror";
         public override string ShortenedName => "MR";
-        public override ModType Type => ModType.Conversion;
+        public override ModType Type => ModType.Special;
         public override double ScoreMultiplier => 1;
         public override bool Ranked => true;
 

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

@@ -16,7 +16,6 @@ namespace osu.Game.Rulesets.Mania.Mods
     {
         public override string Name => "Random";
         public override string ShortenedName => "RD";
-        public override ModType Type => ModType.Conversion;
         public override FontAwesome Icon => FontAwesome.fa_osu_dice;
         public override string Description => @"Shuffle around the keys!";
         public override double ScoreMultiplier => 1;

osu.Game.Rulesets.Osu.Tests/.vscode/launch.json

@@ -2,7 +2,35 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "VisualTests (Debug)",
+            "name": "VisualTests (Debug, net471)",
+            "windows": {
+                "type": "clr"
+            },
+            "type": "mono",
+            "request": "launch",
+            "program": "${workspaceRoot}/bin/Debug/net471/osu.Game.Rulesets.Osu.Tests.exe",
+            "cwd": "${workspaceRoot}",
+            "preLaunchTask": "Build (Debug, msbuild)",
+            "runtimeExecutable": null,
+            "env": {},
+            "console": "internalConsole"
+        },
+        {
+            "name": "VisualTests (Release, net471)",
+            "windows": {
+                "type": "clr"
+            },
+            "type": "mono",
+            "request": "launch",
+            "program": "${workspaceRoot}/bin/Release/net471/osu.Game.Rulesets.Osu.Tests.exe",
+            "cwd": "${workspaceRoot}",
+            "preLaunchTask": "Build (Release, msbuild)",
+            "runtimeExecutable": null,
+            "env": {},
+            "console": "internalConsole"
+        },
+        {
+            "name": "VisualTests (Debug, netcoreapp2.1)",
             "type": "coreclr",
             "request": "launch",
             "program": "dotnet",
@@ -10,12 +38,12 @@
                 "${workspaceRoot}/bin/Debug/netcoreapp2.1/osu.Game.Rulesets.Osu.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
-            "preLaunchTask": "Build (Debug)",
+            "preLaunchTask": "Build (Debug, dotnet)",
             "env": {},
             "console": "internalConsole"
         },
         {
-            "name": "VisualTests (Release)",
+            "name": "VisualTests (Release, netcoreapp2.1)",
             "type": "coreclr",
             "request": "launch",
             "program": "dotnet",
@@ -23,7 +51,7 @@
                 "${workspaceRoot}/bin/Release/netcoreapp2.1/osu.Game.Rulesets.Osu.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
-            "preLaunchTask": "Build (Release)",
+            "preLaunchTask": "Build (Release, dotnet)",
             "env": {},
             "console": "internalConsole"
         }

osu.Game.Rulesets.Osu.Tests/.vscode/tasks.json

@@ -4,13 +4,12 @@
     "version": "2.0.0",
     "tasks": [
         {
-            "label": "Build (Debug)",
+            "label": "Build (Debug, msbuild)",
             "type": "shell",
-            "command": "dotnet",
+            "command": "msbuild",
             "args": [
-                "build",
-                "--no-restore",
                 "osu.Game.Rulesets.Osu.Tests.csproj",
+                "/p:TargetFramework=net471",
                 "/p:GenerateFullPaths=true",
                 "/m",
                 "/verbosity:m"
@@ -19,13 +18,45 @@
             "problemMatcher": "$msCompile"
         },
         {
-            "label": "Build (Release)",
+            "label": "Build (Release, msbuild)",
+            "type": "shell",
+            "command": "msbuild",
+            "args": [
+                "osu.Game.Rulesets.Osu.Tests.csproj",
+                "/p:Configuration=Release",
+                "/p:TargetFramework=net471",
+                "/p:GenerateFullPaths=true",
+                "/m",
+                "/verbosity:m"
+            ],
+            "group": "build",
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "Build (Debug, dotnet)",
             "type": "shell",
             "command": "dotnet",
             "args": [
                 "build",
                 "--no-restore",
                 "osu.Game.Rulesets.Osu.Tests.csproj",
+                "/p:TargetFramework=netcoreapp2.1",
+                "/p:GenerateFullPaths=true",
+                "/m",
+                "/verbosity:m"
+            ],
+            "group": "build",
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "Build (Release, dotnet)",
+            "type": "shell",
+            "command": "dotnet",
+            "args": [
+                "build",
+                "--no-restore",
+                "osu.Game.Rulesets.Osu.Tests.csproj",
+                "/p:TargetFramework=netcoreapp2.1",
                 "/p:Configuration=Release",
                 "/p:GenerateFullPaths=true",
                 "/m",
@@ -35,7 +66,16 @@
             "problemMatcher": "$msCompile"
         },
         {
-            "label": "Restore",
+            "label": "Restore (net471)",
+            "type": "shell",
+            "command": "nuget",
+            "args": [
+                "restore"
+            ],
+            "problemMatcher": []
+        },
+        {
+            "label": "Restore (netcoreapp2.1)",
             "type": "shell",
             "command": "dotnet",
             "args": [

osu.Game.Rulesets.Osu.Tests/osu.Game.Rulesets.Osu.Tests.csproj

@@ -1,14 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\osu.TestProject.props" />
-  <ItemGroup Label="Package References">
-    <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
-    <PackageReference Include="NUnit" Version="3.10.1" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
-  </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFrameworks>netcoreapp2.1;net471</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup Label="Project References">
     <ProjectReference Include="..\osu.Game.Rulesets.Osu\osu.Game.Rulesets.Osu.csproj" />

osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs

@@ -12,7 +12,6 @@ namespace osu.Game.Rulesets.Osu.Mods
         public override string Name => "Autopilot";
         public override string ShortenedName => "AP";
         public override FontAwesome Icon => FontAwesome.fa_osu_mod_autopilot;
-        public override ModType Type => ModType.Automation;
         public override string Description => @"Automatic cursor movement - just follow the rhythm.";
         public override double ScoreMultiplier => 1;
         public override Type[] IncompatibleMods => new[] { typeof(OsuModSpunOut), typeof(ModRelax), typeof(ModSuddenDeath), typeof(ModNoFail), typeof(ModAutoplay) };

osu.Game.Rulesets.Osu/Mods/OsuModSpunOut.cs

@@ -12,7 +12,6 @@ namespace osu.Game.Rulesets.Osu.Mods
         public override string Name => "Spun Out";
         public override string ShortenedName => "SO";
         public override FontAwesome Icon => FontAwesome.fa_osu_mod_spunout;
-        public override ModType Type => ModType.DifficultyReduction;
         public override string Description => @"Spinners will be automatically completed.";
         public override double ScoreMultiplier => 0.9;
         public override bool Ranked => true;

osu.Game.Rulesets.Osu/Mods/OsuModTarget.cs

@@ -10,7 +10,6 @@ namespace osu.Game.Rulesets.Osu.Mods
     {
         public override string Name => "Target";
         public override string ShortenedName => "TP";
-        public override ModType Type => ModType.Conversion;
         public override FontAwesome Icon => FontAwesome.fa_osu_mod_target;
         public override string Description => @"Practice keeping up with the beat of the song.";
         public override double ScoreMultiplier => 1;

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

@@ -7,7 +7,6 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
 {
@@ -21,26 +20,27 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
         {
             Origin = Anchor.Centre;
 
-            Child = new SkinnableDrawable("Play/osu/followpoint", _ => new Container
+            Masking = true;
+            AutoSizeAxes = Axes.Both;
+            CornerRadius = width / 2;
+            EdgeEffect = new EdgeEffectParameters
             {
-                Masking = true,
-                AutoSizeAxes = Axes.Both,
-                CornerRadius = width / 2,
-                EdgeEffect = new EdgeEffectParameters
-                {
-                    Type = EdgeEffectType.Glow,
-                    Colour = Color4.White.Opacity(0.2f),
-                    Radius = 4,
-                },
-                Child = new Box
+                Type = EdgeEffectType.Glow,
+                Colour = Color4.White.Opacity(0.2f),
+                Radius = 4,
+            };
+
+            Children = new Drawable[]
+            {
+                new Box
                 {
                     Size = new Vector2(width),
                     Blending = BlendingMode.Additive,
                     Origin = Anchor.Centre,
                     Anchor = Anchor.Centre,
                     Alpha = 0.5f,
-                }
-            }, restrictSize: false);
+                },
+            };
         }
     }
 }

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

@@ -73,7 +73,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
 
                     Vector2 distanceVector = endPosition - startPosition;
                     int distance = (int)distanceVector.Length;
-                    float rotation = (float)(Math.Atan2(distanceVector.Y, distanceVector.X) * (180 / Math.PI));
+                    float rotation = (float)Math.Atan2(distanceVector.Y, distanceVector.X);
                     double duration = endTime - startTime;
 
                     for (int d = (int)(PointDistance * 1.5); d < distance - PointDistance; d += PointDistance)

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

@@ -10,7 +10,6 @@ using OpenTK;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Scoring;
-using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
@@ -34,11 +33,11 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             InternalChildren = new Drawable[]
             {
-                new SkinnableDrawable("Play/osu/reversearrow", _ => new SpriteIcon
+                new SpriteIcon
                 {
                     RelativeSizeAxes = Axes.Both,
                     Icon = FontAwesome.fa_chevron_right
-                }, restrictSize: false)
+                }
             };
         }
 
@@ -75,8 +74,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             }
         }
 
-        private bool hasRotation;
-
         public void UpdateSnakingPosition(Vector2 start, Vector2 end)
         {
             bool isRepeatAtEnd = repeatPoint.RepeatIndex % 2 == 0;
@@ -90,33 +87,15 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             int searchStart = isRepeatAtEnd ? curve.Count - 1 : 0;
             int direction = isRepeatAtEnd ? -1 : 1;
 
-            Vector2 aimRotationVector = Vector2.Zero;
-
             // find the next vector2 in the curve which is not equal to our current position to infer a rotation.
             for (int i = searchStart; i >= 0 && i < curve.Count; i += direction)
             {
                 if (Precision.AlmostEquals(curve[i], Position))
                     continue;
 
-                aimRotationVector = curve[i];
+                Rotation = MathHelper.RadiansToDegrees((float)Math.Atan2(curve[i].Y - Position.Y, curve[i].X - Position.X));
                 break;
             }
-
-
-            float aimRotation = MathHelper.RadiansToDegrees((float)Math.Atan2(aimRotationVector.Y - Position.Y, aimRotationVector.X - Position.X));
-            while (Math.Abs(aimRotation - Rotation) > 180)
-                aimRotation += aimRotation < Rotation ? 360 : -360;
-
-            if (!hasRotation)
-            {
-                Rotation = aimRotation;
-                hasRotation = true;
-            }
-            else
-            {
-                // If we're already snaking, interpolate to smooth out sharp curves (linear sliders, mainly).
-                Rotation = Interpolation.ValueAt(MathHelper.Clamp(Clock.ElapsedFrameTime, 0, 100), Rotation, aimRotation, 0, 50, Easing.OutQuint);
-            }
         }
     }
 }

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

@@ -8,8 +8,6 @@ using OpenTK.Graphics;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Scoring;
-using osu.Game.Skinning;
-using osu.Framework.Graphics.Containers;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
@@ -24,27 +22,23 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         public DrawableSliderTick(SliderTick sliderTick) : base(sliderTick)
         {
             Size = new Vector2(16) * sliderTick.Scale;
+
+            Masking = true;
+            CornerRadius = Size.X / 2;
+
             Origin = Anchor.Centre;
 
+            BorderThickness = 2;
+            BorderColour = Color4.White;
+
             InternalChildren = new Drawable[]
             {
-                new SkinnableDrawable("Play/osu/sliderscorepoint", _ => new Container
+                new Box
                 {
-                    Masking = true,
                     RelativeSizeAxes = Axes.Both,
-                    Origin = Anchor.Centre,
-                    CornerRadius = Size.X / 2,
-
-                    BorderThickness = 2,
-                    BorderColour = Color4.White,
-
-                    Child = new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Colour = AccentColour,
-                        Alpha = 0.3f,
-                    }
-                }, restrictSize: false)
+                    Colour = AccentColour,
+                    Alpha = 0.3f,
+                }
             };
         }
 

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

@@ -10,7 +10,6 @@ using osu.Framework.Input.States;
 using osu.Game.Rulesets.Objects.Types;
 using OpenTK;
 using OpenTK.Graphics;
-using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 {
@@ -19,7 +18,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
         private const float width = 128;
 
         private Color4 accentColour = Color4.Black;
-
         /// <summary>
         /// The colour that is used for the slider ball.
         /// </summary>
@@ -29,14 +27,14 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
             set
             {
                 accentColour = value;
-                if (drawableBall != null)
-                    drawableBall.Colour = value;
+                if (ball != null)
+                    ball.Colour = value;
             }
         }
 
         private readonly Slider slider;
-        public readonly Drawable FollowCircle;
-        private Drawable drawableBall;
+        public readonly Box FollowCircle;
+        private readonly Box ball;
 
         public SliderBall(Slider slider)
         {
@@ -45,30 +43,19 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
             AutoSizeAxes = Axes.Both;
             Blending = BlendingMode.Additive;
             Origin = Anchor.Centre;
+            BorderThickness = 10;
+            BorderColour = Color4.Orange;
 
-            Children = new[]
+            Children = new Drawable[]
             {
-                FollowCircle = new Container
+                FollowCircle = new Box
                 {
                     Origin = Anchor.Centre,
                     Anchor = Anchor.Centre,
+                    Colour = Color4.Orange,
                     Width = width,
                     Height = width,
                     Alpha = 0,
-                    Child = new SkinnableDrawable("Play/osu/sliderfollowcircle", _ => new CircularContainer
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Masking = true,
-                        BorderThickness = 5,
-                        BorderColour = Color4.Orange,
-                        Blending = BlendingMode.Additive,
-                        Child = new Box
-                        {
-                            Colour = Color4.Orange,
-                            RelativeSizeAxes = Axes.Both,
-                            Alpha = 0.2f,
-                        }
-                    }),
                 },
                 new CircularContainer
                 {
@@ -76,26 +63,18 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
                     AutoSizeAxes = Axes.Both,
                     Origin = Anchor.Centre,
                     Anchor = Anchor.Centre,
+                    BorderThickness = 10,
+                    BorderColour = Color4.White,
                     Alpha = 1,
-                    Child = new Container
+                    Children = new[]
                     {
-                        Width = width,
-                        Height = width,
-                        // TODO: support skin filename animation (sliderb0, sliderb1...)
-                        Child = new SkinnableDrawable("Play/osu/sliderb", _ => new CircularContainer
+                        ball = new Box
                         {
-                            Masking = true,
-                            RelativeSizeAxes = Axes.Both,
-                            BorderThickness = 10,
-                            BorderColour = Color4.White,
-                            Alpha = 1,
-                            Child = drawableBall = new Box
-                            {
-                                Colour = AccentColour,
-                                RelativeSizeAxes = Axes.Both,
-                                Alpha = 0.4f,
-                            }
-                        }),
+                            Colour = AccentColour,
+                            Alpha = 0.4f,
+                            Width = width,
+                            Height = width,
+                        },
                     }
                 }
             };
@@ -132,7 +111,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
         }
 
         private bool tracking;
-
         public bool Tracking
         {
             get { return tracking; }
@@ -142,8 +120,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
                     return;
                 tracking = value;
 
-                FollowCircle.ScaleTo(tracking ? 2f : 1, 300, Easing.OutQuint);
-                FollowCircle.FadeTo(tracking ? 1f : 0, 300, Easing.OutQuint);
+                FollowCircle.ScaleTo(tracking ? 2.8f : 1, 300, Easing.OutQuint);
+                FollowCircle.FadeTo(tracking ? 0.2f : 0, 300, Easing.OutQuint);
             }
         }
 

osu.Game.Rulesets.Osu/Objects/RepeatPoint.cs

@@ -16,9 +16,6 @@ namespace osu.Game.Rulesets.Osu.Objects
         {
             base.ApplyDefaultsToSelf(controlPointInfo, difficulty);
 
-            // Out preempt should be one span early to give the user ample warning.
-            TimePreempt += SpanDuration;
-
             // We want to show the first RepeatPoint as the TimePreempt dictates but on short (and possibly fast) sliders
             // we may need to cut down this time on following RepeatPoints to only show up to two RepeatPoints at any given time.
             if (RepeatIndex > 0)

osu.Game.Rulesets.Osu/OsuRuleset.cs

@@ -94,7 +94,6 @@ namespace osu.Game.Rulesets.Osu
                         new OsuModEasy(),
                         new OsuModNoFail(),
                         new MultiMod(new OsuModHalfTime(), new OsuModDaycore()),
-                        new OsuModSpunOut(),
                     };
                 case ModType.DifficultyIncrease:
                     return new Mod[]
@@ -105,17 +104,14 @@ namespace osu.Game.Rulesets.Osu
                         new OsuModHidden(),
                         new OsuModFlashlight(),
                     };
-                case ModType.Conversion:
+                case ModType.Special:
                     return new Mod[]
                     {
-                        new OsuModTarget(),
-                    };
-                case ModType.Automation:
-                    return new Mod[]
-                    {
-                        new MultiMod(new OsuModAutoplay(), new ModCinema()),
                         new OsuModRelax(),
                         new OsuModAutopilot(),
+                        new OsuModSpunOut(),
+                        new MultiMod(new OsuModAutoplay(), new ModCinema()),
+                        new OsuModTarget(),
                     };
                 default:
                     return new Mod[] { };

osu.Game.Rulesets.Taiko.Tests/.vscode/launch.json

@@ -2,7 +2,35 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "VisualTests (Debug)",
+            "name": "VisualTests (Debug, net471)",
+            "windows": {
+                "type": "clr"
+            },
+            "type": "mono",
+            "request": "launch",
+            "program": "${workspaceRoot}/bin/Debug/net471/osu.Game.Rulesets.Taiko.Tests.exe",
+            "cwd": "${workspaceRoot}",
+            "preLaunchTask": "Build (Debug, msbuild)",
+            "runtimeExecutable": null,
+            "env": {},
+            "console": "internalConsole"
+        },
+        {
+            "name": "VisualTests (Release, net471)",
+            "windows": {
+                "type": "clr"
+            },
+            "type": "mono",
+            "request": "launch",
+            "program": "${workspaceRoot}/bin/Release/net471/osu.Game.Rulesets.Taiko.Tests.exe",
+            "cwd": "${workspaceRoot}",
+            "preLaunchTask": "Build (Release, msbuild)",
+            "runtimeExecutable": null,
+            "env": {},
+            "console": "internalConsole"
+        },
+        {
+            "name": "VisualTests (Debug, netcoreapp2.1)",
             "type": "coreclr",
             "request": "launch",
             "program": "dotnet",
@@ -10,12 +38,12 @@
                 "${workspaceRoot}/bin/Debug/netcoreapp2.1/osu.Game.Rulesets.Taiko.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
-            "preLaunchTask": "Build (Debug)",
+            "preLaunchTask": "Build (Debug, dotnet)",
             "env": {},
             "console": "internalConsole"
         },
         {
-            "name": "VisualTests (Release)",
+            "name": "VisualTests (Release, netcoreapp2.1)",
             "type": "coreclr",
             "request": "launch",
             "program": "dotnet",
@@ -23,7 +51,7 @@
                 "${workspaceRoot}/bin/Release/netcoreapp2.1/osu.Game.Rulesets.Taiko.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
-            "preLaunchTask": "Build (Release)",
+            "preLaunchTask": "Build (Release, dotnet)",
             "env": {},
             "console": "internalConsole"
         }

osu.Game.Rulesets.Taiko.Tests/.vscode/tasks.json

@@ -4,13 +4,12 @@
     "version": "2.0.0",
     "tasks": [
         {
-            "label": "Build (Debug)",
+            "label": "Build (Debug, msbuild)",
             "type": "shell",
-            "command": "dotnet",
+            "command": "msbuild",
             "args": [
-                "build",
-                "--no-restore",
                 "osu.Game.Rulesets.Taiko.Tests.csproj",
+                "/p:TargetFramework=net471",
                 "/p:GenerateFullPaths=true",
                 "/m",
                 "/verbosity:m"
@@ -19,13 +18,45 @@
             "problemMatcher": "$msCompile"
         },
         {
-            "label": "Build (Release)",
+            "label": "Build (Release, msbuild)",
+            "type": "shell",
+            "command": "msbuild",
+            "args": [
+                "osu.Game.Rulesets.Taiko.Tests.csproj",
+                "/p:Configuration=Release",
+                "/p:TargetFramework=net471",
+                "/p:GenerateFullPaths=true",
+                "/m",
+                "/verbosity:m"
+            ],
+            "group": "build",
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "Build (Debug, dotnet)",
             "type": "shell",
             "command": "dotnet",
             "args": [
                 "build",
                 "--no-restore",
                 "osu.Game.Rulesets.Taiko.Tests.csproj",
+                "/p:TargetFramework=netcoreapp2.1",
+                "/p:GenerateFullPaths=true",
+                "/m",
+                "/verbosity:m"
+            ],
+            "group": "build",
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "Build (Release, dotnet)",
+            "type": "shell",
+            "command": "dotnet",
+            "args": [
+                "build",
+                "--no-restore",
+                "osu.Game.Rulesets.Taiko.Tests.csproj",
+                "/p:TargetFramework=netcoreapp2.1",
                 "/p:Configuration=Release",
                 "/p:GenerateFullPaths=true",
                 "/m",
@@ -35,7 +66,16 @@
             "problemMatcher": "$msCompile"
         },
         {
-            "label": "Restore",
+            "label": "Restore (net471)",
+            "type": "shell",
+            "command": "nuget",
+            "args": [
+                "restore"
+            ],
+            "problemMatcher": []
+        },
+        {
+            "label": "Restore (netcoreapp2.1)",
             "type": "shell",
             "command": "dotnet",
             "args": [

osu.Game.Rulesets.Taiko.Tests/osu.Game.Rulesets.Taiko.Tests.csproj

@@ -1,14 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\osu.TestProject.props" />
-  <ItemGroup Label="Package References">
-    <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
-    <PackageReference Include="NUnit" Version="3.10.1" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
-  </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFrameworks>netcoreapp2.1;net471</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup Label="Project References">
     <ProjectReference Include="..\osu.Game.Rulesets.Taiko\osu.Game.Rulesets.Taiko.csproj" />

osu.Game.Rulesets.Taiko/TaikoRuleset.cs

@@ -93,11 +93,13 @@ namespace osu.Game.Rulesets.Taiko
                         new TaikoModHidden(),
                         new TaikoModFlashlight(),
                     };
-                case ModType.Automation:
+                case ModType.Special:
                     return new Mod[]
                     {
-                        new MultiMod(new TaikoModAutoplay(), new ModCinema()),
                         new TaikoModRelax(),
+                        null,
+                        null,
+                        new MultiMod(new TaikoModAutoplay(), new ModCinema()),
                     };
                 default:
                     return new Mod[] { };

osu.Game.Tests/Visual/TestCaseMods.cs

@@ -16,7 +16,6 @@ using System.Collections.Generic;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Overlays.Mods.Sections;
 using osu.Game.Rulesets.Mania;
 using osu.Game.Rulesets.Mania.Mods;
 using osu.Game.Rulesets.UI;
@@ -37,9 +36,7 @@ namespace osu.Game.Tests.Visual
             typeof(ModButtonEmpty),
             typeof(DifficultyReductionSection),
             typeof(DifficultyIncreaseSection),
-            typeof(AutomationSection),
-            typeof(ConversionSection),
-            typeof(FunSection),
+            typeof(SpecialSection),
         };
 
         private RulesetStore rulesets;
@@ -98,7 +95,7 @@ namespace osu.Game.Tests.Visual
         {
             var easierMods = ruleset.GetModsFor(ModType.DifficultyReduction);
             var harderMods = ruleset.GetModsFor(ModType.DifficultyIncrease);
-            var assistMods = ruleset.GetModsFor(ModType.Automation);
+            var assistMods = ruleset.GetModsFor(ModType.Special);
 
             var noFailMod = easierMods.FirstOrDefault(m => m is OsuModNoFail);
             var hiddenMod = harderMods.FirstOrDefault(m => m is OsuModHidden);
@@ -122,7 +119,7 @@ namespace osu.Game.Tests.Visual
 
         private void testManiaMods(ManiaRuleset ruleset)
         {
-            testRankedText(ruleset.GetModsFor(ModType.Conversion).First(m => m is ManiaModRandom));
+            testRankedText(ruleset.GetModsFor(ModType.Special).First(m => m is ManiaModRandom));
         }
 
         private void testSingleMod(Mod mod)

osu.Game.Tests/Visual/TestCaseScreenBreadcrumbControl.cs

@@ -54,11 +54,11 @@ namespace osu.Game.Tests.Visual
 
             breadcrumbs.Current.TriggerChange();
 
-            waitForCurrent();
+            assertCurrent();
             pushNext();
-            waitForCurrent();
+            assertCurrent();
             pushNext();
-            waitForCurrent();
+            assertCurrent();
 
             AddStep(@"make start current", () =>
             {
@@ -66,9 +66,8 @@ namespace osu.Game.Tests.Visual
                 currentScreen = startScreen;
             });
 
-            waitForCurrent();
+            assertCurrent();
             pushNext();
-            waitForCurrent();
             AddAssert(@"only 2 items", () => breadcrumbs.Items.Count() == 2);
             AddStep(@"exit current", () => changedScreen.Exit());
             AddAssert(@"current screen is first", () => startScreen == changedScreen);
@@ -81,7 +80,7 @@ namespace osu.Game.Tests.Visual
         }
 
         private void pushNext() => AddStep(@"push next screen", () => currentScreen = ((TestScreen)currentScreen).PushNext());
-        private void waitForCurrent() => AddUntilStep(() => currentScreen.IsCurrentScreen, "current screen");
+        private void assertCurrent() => AddAssert(@"changedScreen correct", () => currentScreen == changedScreen);
 
         private abstract class TestScreen : OsuScreen
         {

osu.Game.Tests/osu.Game.Tests.csproj

@@ -1,14 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\osu.TestProject.props" />
-  <ItemGroup Label="Package References">
-    <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
-    <PackageReference Include="NUnit" Version="3.10.1" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
-  </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFrameworks>netcoreapp2.1;net471</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup Label="Project References">
     <ProjectReference Include="..\osu.Game.Rulesets.Osu\osu.Game.Rulesets.Osu.csproj" />

osu.Game/Graphics/UserInterface/OsuTabControl.cs

@@ -37,7 +37,7 @@ namespace osu.Game.Graphics.UserInterface
         {
             TabContainer.Spacing = new Vector2(10f, 0f);
 
-            AddInternal(strip = new Box
+            Add(strip = new Box
             {
                 Anchor = Anchor.BottomLeft,
                 Origin = Anchor.BottomLeft,

osu.Game/Online/Chat/InfoMessage.cs

@@ -6,7 +6,7 @@ using osu.Game.Users;
 
 namespace osu.Game.Online.Chat
 {
-    public class InfoMessage : LocalMessage
+    public class InfoMessage : Message
     {
         private static int infoID = -1;
 

osu.Game/Online/Chat/LocalEchoMessage.cs

@@ -3,7 +3,7 @@
 
 namespace osu.Game.Online.Chat
 {
-    public class LocalEchoMessage : LocalMessage
+    public class LocalEchoMessage : Message
     {
         public LocalEchoMessage() : base(null)
         {

osu.Game/Online/Chat/LocalMessage.cs

@@ -1,16 +0,0 @@
-// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-namespace osu.Game.Online.Chat
-{
-    /// <summary>
-    /// A message which is generated and displayed locally.
-    /// </summary>
-    public class LocalMessage : Message
-    {
-        protected LocalMessage(long? id)
-            : base(id)
-        {
-        }
-    }
-}

osu.Game/Overlays/BeatmapSet/Buttons/DownloadButton.cs

@@ -1,28 +1,18 @@
 // Copyright (c) 2007-2018 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.Configuration;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Cursor;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Online.API;
-using osu.Game.Users;
 using OpenTK;
-using OpenTK.Graphics;
 
 namespace osu.Game.Overlays.BeatmapSet.Buttons
 {
-    public class DownloadButton : HeaderButton, IHasTooltip
+    public class DownloadButton : HeaderButton
     {
-        public string TooltipText => Enabled ? null : "You gotta be an osu!supporter to download for now 'yo";
-
-        private readonly IBindable<User> localUser = new Bindable<User>();
-
         public DownloadButton(BeatmapSetInfo set, bool noVideo = false)
         {
             Width = 120;
@@ -96,17 +86,5 @@ namespace osu.Game.Overlays.BeatmapSet.Buttons
                 }
             };
         }
-
-        [BackgroundDependencyLoader]
-        private void load(APIAccess api)
-        {
-            localUser.BindTo(api.LocalUser);
-            localUser.BindValueChanged(userChanged, true);
-            Enabled.BindValueChanged(enabledChanged, true);
-        }
-
-        private void userChanged(User user) => Enabled.Value = user.IsSupporter;
-
-        private void enabledChanged(bool enabled) => this.FadeColour(enabled ? Color4.White : Color4.Gray, 200, Easing.OutQuint);
     }
 }

osu.Game/Overlays/Chat/DrawableChannel.cs

@@ -85,7 +85,7 @@ namespace osu.Game.Overlays.Chat
 
             if (!IsLoaded) return;
 
-            if (scroll.IsScrolledToEnd(10) || !flow.Children.Any() || newMessages.Any(m => m is LocalMessage))
+            if (scroll.IsScrolledToEnd(10) || !flow.Children.Any())
                 scrollToEnd();
 
             var staleMessages = flow.Children.Where(c => c.LifetimeEnd == double.MaxValue).ToArray();

osu.Game/Overlays/Mods/DifficultyIncreaseSection.cs

@@ -1,16 +1,24 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Game.Rulesets.Mods;
 using OpenTK.Input;
+using osu.Framework.Allocation;
+using osu.Game.Graphics;
+using osu.Game.Rulesets.Mods;
 
-namespace osu.Game.Overlays.Mods.Sections
+namespace osu.Game.Overlays.Mods
 {
     public class DifficultyIncreaseSection : ModSection
     {
         protected override Key[] ToggleKeys => new[] { Key.A, Key.S, Key.D, Key.F, Key.G, Key.H, Key.J, Key.K, Key.L };
         public override ModType ModType => ModType.DifficultyIncrease;
 
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            SelectedColour = colours.YellowLight;
+        }
+
         public DifficultyIncreaseSection()
         {
             Header = @"Difficulty Increase";

osu.Game/Overlays/Mods/DifficultyReductionSection.cs

@@ -1,16 +1,24 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Game.Rulesets.Mods;
 using OpenTK.Input;
+using osu.Framework.Allocation;
+using osu.Game.Graphics;
+using osu.Game.Rulesets.Mods;
 
-namespace osu.Game.Overlays.Mods.Sections
+namespace osu.Game.Overlays.Mods
 {
     public class DifficultyReductionSection : ModSection
     {
         protected override Key[] ToggleKeys => new[] { Key.Q, Key.W, Key.E, Key.R, Key.T, Key.Y, Key.U, Key.I, Key.O, Key.P };
         public override ModType ModType => ModType.DifficultyReduction;
 
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            SelectedColour = colours.GreenLight;
+        }
+
         public DifficultyReductionSection()
         {
             Header = @"Difficulty Reduction";

osu.Game/Overlays/Mods/ModSection.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using OpenTK;
+using OpenTK.Graphics;
 using OpenTK.Input;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -44,6 +45,7 @@ namespace osu.Game.Overlays.Mods
 
                     return new ModButton(m)
                     {
+                        SelectedColour = selectedColour,
                         SelectionChanged = Action,
                     };
                 }).ToArray();
@@ -55,14 +57,25 @@ namespace osu.Game.Overlays.Mods
 
         private ModButton[] buttons = { };
 
+        private Color4 selectedColour = Color4.White;
+        public Color4 SelectedColour
+        {
+            get => selectedColour;
+            set
+            {
+                if (value == selectedColour) return;
+                selectedColour = value;
+
+                foreach (ModButton button in buttons)
+                    button.SelectedColour = value;
+            }
+        }
+
         protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
         {
-            if (ToggleKeys != null)
-            {
-                var index = Array.IndexOf(ToggleKeys, args.Key);
-                if (index > -1 && index < buttons.Length)
-                    buttons[index].SelectNext(state.Keyboard.ShiftPressed ? -1 : 1);
-            }
+            var index = Array.IndexOf(ToggleKeys, args.Key);
+            if (index > -1 && index < buttons.Length)
+                buttons[index].SelectNext(state.Keyboard.ShiftPressed ? -1 : 1);
 
             return base.OnKeyDown(state, args);
         }
@@ -112,10 +125,6 @@ namespace osu.Game.Overlays.Mods
         protected ModSection()
         {
             AutoSizeAxes = Axes.Y;
-            RelativeSizeAxes = Axes.X;
-
-            Origin = Anchor.TopCentre;
-            Anchor = Anchor.TopCentre;
 
             Children = new Drawable[]
             {

osu.Game/Overlays/Mods/ModSelectOverlay.cs

@@ -21,7 +21,6 @@ using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics.Containers;
 using osu.Game.Rulesets;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Overlays.Mods.Sections;
 
 namespace osu.Game.Overlays.Mods
 {
@@ -189,7 +188,6 @@ namespace osu.Game.Overlays.Mods
             Waves.FourthWaveColour = OsuColour.FromHex(@"003a4e");
 
             Height = 510;
-
             Children = new Drawable[]
             {
                 new Container
@@ -213,172 +211,178 @@ namespace osu.Game.Overlays.Mods
                         },
                     },
                 },
-                new GridContainer
+                new FillFlowContainer
                 {
-                    RelativeSizeAxes = Axes.Both,
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
                     Anchor = Anchor.BottomCentre,
                     Origin = Anchor.BottomCentre,
-                    RowDimensions = new[]
+                    Direction = FillDirection.Vertical,
+                    Spacing = new Vector2(0f, 10f),
+                    Children = new Drawable[]
                     {
-                        new Dimension(GridSizeMode.Absolute, 90),
-                        new Dimension(GridSizeMode.Distributed),
-                        new Dimension(GridSizeMode.Absolute, 70),
-                    },
-                    Content = new[]
-                    {
-                        new Drawable[]
+                        // Header
+                        new Container
                         {
-                            new Container
+                            RelativeSizeAxes = Axes.X,
+                            Height = 82,
+                            Origin = Anchor.TopCentre,
+                            Anchor = Anchor.TopCentre,
+                            Children = new Drawable[]
                             {
-                                RelativeSizeAxes = Axes.Both,
-                                Origin = Anchor.TopCentre,
-                                Anchor = Anchor.TopCentre,
-                                Children = new Drawable[]
+                                new Box
                                 {
-                                    new Box
-                                    {
-                                        RelativeSizeAxes = Axes.Both,
-                                        Colour = OsuColour.Gray(10).Opacity(100),
-                                    },
-                                    new FillFlowContainer
-                                    {
-                                        Origin = Anchor.Centre,
-                                        Anchor = Anchor.Centre,
-                                        RelativeSizeAxes = Axes.X,
-                                        AutoSizeAxes = Axes.Y,
-                                        Direction = FillDirection.Vertical,
-                                        Width = content_width,
-                                        Children = new Drawable[]
-                                        {
-                                            new OsuSpriteText
-                                            {
-                                                Font = @"Exo2.0-Bold",
-                                                Text = @"Gameplay Mods",
-                                                TextSize = 22,
-                                                Shadow = true,
-                                                Margin = new MarginPadding
-                                                {
-                                                    Bottom = 4,
-                                                },
-                                            },
-                                            new OsuTextFlowContainer(text =>
-                                            {
-                                                text.TextSize = 18;
-                                                text.Shadow = true;
-                                            })
-                                            {
-                                                RelativeSizeAxes = Axes.X,
-                                                AutoSizeAxes = Axes.Y,
-                                                Text = "Mods provide different ways to enjoy gameplay. Some have an effect on the score you can achieve during ranked play.\nOthers are just for fun.",
-                                            },
-                                        },
-                                    },
+                                    RelativeSizeAxes = Axes.Both,
+                                    Colour = OsuColour.Gray(10).Opacity(100),
                                 },
-                            },
-                        },
-                        new Drawable[]
-                        {
-                            // Body
-                            new OsuScrollContainer
-                            {
-                                ScrollbarVisible = false,
-                                Origin = Anchor.TopCentre,
-                                Anchor = Anchor.TopCentre,
-                                RelativeSizeAxes = Axes.Both,
-                                Padding = new MarginPadding { Vertical = 10 },
-                                Child = ModSectionsContainer = new FillFlowContainer<ModSection>
+                                new FillFlowContainer
                                 {
                                     Origin = Anchor.TopCentre,
                                     Anchor = Anchor.TopCentre,
                                     RelativeSizeAxes = Axes.X,
                                     AutoSizeAxes = Axes.Y,
-                                    Spacing = new Vector2(0f, 10f),
+                                    Direction = FillDirection.Vertical,
                                     Width = content_width,
-                                    Children = new ModSection[]
+                                    Padding = new MarginPadding
                                     {
-                                        new DifficultyReductionSection { Action = modButtonPressed },
-                                        new DifficultyIncreaseSection { Action = modButtonPressed },
-                                        new AutomationSection { Action = modButtonPressed },
-                                        new ConversionSection { Action = modButtonPressed },
-                                        new FunSection { Action = modButtonPressed },
-                                    }
+                                        Top = 10,
+                                        Bottom = 10,
+                                    },
+                                    Children = new Drawable[]
+                                    {
+                                        new OsuSpriteText
+                                        {
+                                            Font = @"Exo2.0-Bold",
+                                            Text = @"Gameplay Mods",
+                                            TextSize = 22,
+                                            Shadow = true,
+                                            Margin = new MarginPadding
+                                            {
+                                                Bottom = 4,
+                                            },
+                                        },
+                                        new OsuSpriteText
+                                        {
+                                            Text = @"Mods provide different ways to enjoy gameplay. Some have an effect on the score you can achieve during ranked play.",
+                                            TextSize = 18,
+                                            Shadow = true,
+                                        },
+                                        new OsuSpriteText
+                                        {
+                                            Text = @"Others are just for fun.",
+                                            TextSize = 18,
+                                            Shadow = true,
+                                        },
+                                    },
                                 },
                             },
                         },
-                        new Drawable[]
+                        // Body
+                        ModSectionsContainer = new FillFlowContainer<ModSection>
                         {
-                            // Footer
-                            new Container
+                            Origin = Anchor.TopCentre,
+                            Anchor = Anchor.TopCentre,
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y,
+                            Spacing = new Vector2(0f, 10f),
+                            Width = content_width,
+                            Children = new ModSection[]
                             {
-                                RelativeSizeAxes = Axes.Both,
-                                Origin = Anchor.TopCentre,
-                                Anchor = Anchor.TopCentre,
-                                Children = new Drawable[]
+                                new DifficultyReductionSection
                                 {
-                                    new Box
+                                    RelativeSizeAxes = Axes.X,
+                                    Origin = Anchor.TopCentre,
+                                    Anchor = Anchor.TopCentre,
+                                    Action = modButtonPressed,
+                                },
+                                new DifficultyIncreaseSection
+                                {
+                                    RelativeSizeAxes = Axes.X,
+                                    Origin = Anchor.TopCentre,
+                                    Anchor = Anchor.TopCentre,
+                                    Action = modButtonPressed,
+                                },
+                                new SpecialSection
+                                {
+                                    RelativeSizeAxes = Axes.X,
+                                    Origin = Anchor.TopCentre,
+                                    Anchor = Anchor.TopCentre,
+                                    Action = modButtonPressed,
+                                },
+                            }
+                        },
+                        // Footer
+                        new Container
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            Height = 70,
+                            Origin = Anchor.TopCentre,
+                            Anchor = Anchor.TopCentre,
+                            Children = new Drawable[]
+                            {
+                                new Box
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                    Colour = new Color4(172, 20, 116, 255),
+                                    Alpha = 0.5f,
+                                },
+                                footerContainer = new FillFlowContainer
+                                {
+                                    Origin = Anchor.BottomCentre,
+                                    Anchor = Anchor.BottomCentre,
+                                    AutoSizeAxes = Axes.Y,
+                                    RelativeSizeAxes = Axes.X,
+                                    Width = content_width,
+                                    Direction = FillDirection.Horizontal,
+                                    Padding = new MarginPadding
                                     {
-                                        RelativeSizeAxes = Axes.Both,
-                                        Colour = new Color4(172, 20, 116, 255),
-                                        Alpha = 0.5f,
+                                        Vertical = 15
                                     },
-                                    footerContainer = new FillFlowContainer
+                                    Children = new Drawable[]
                                     {
-                                        Origin = Anchor.BottomCentre,
-                                        Anchor = Anchor.BottomCentre,
-                                        AutoSizeAxes = Axes.Y,
-                                        RelativeSizeAxes = Axes.X,
-                                        Width = content_width,
-                                        Direction = FillDirection.Horizontal,
-                                        Padding = new MarginPadding
+                                        DeselectAllButton = new TriangleButton
                                         {
-                                            Vertical = 15
+                                            Width = 180,
+                                            Text = "Deselect All",
+                                            Action = DeselectAll,
+                                            Margin = new MarginPadding
+                                            {
+                                                Right = 20
+                                            }
                                         },
-                                        Children = new Drawable[]
+                                        new OsuSpriteText
                                         {
-                                            DeselectAllButton = new TriangleButton
+                                            Text = @"Score Multiplier:",
+                                            TextSize = 30,
+                                            Margin = new MarginPadding
                                             {
-                                                Width = 180,
-                                                Text = "Deselect All",
-                                                Action = DeselectAll,
-                                                Margin = new MarginPadding
-                                                {
-                                                    Right = 20
-                                                }
-                                            },
-                                            new OsuSpriteText
+                                                Top = 5,
+                                                Right = 10
+                                            }
+                                        },
+                                        MultiplierLabel = new OsuSpriteText
+                                        {
+                                            Font = @"Exo2.0-Bold",
+                                            TextSize = 30,
+                                            Margin = new MarginPadding
                                             {
-                                                Text = @"Score Multiplier:",
-                                                TextSize = 30,
-                                                Margin = new MarginPadding
-                                                {
-                                                    Top = 5,
-                                                    Right = 10
-                                                }
-                                            },
-                                            MultiplierLabel = new OsuSpriteText
+                                                Top = 5
+                                            }
+                                        },
+                                        UnrankedLabel = new OsuSpriteText
+                                        {
+                                            Font = @"Exo2.0-Bold",
+                                            Text = @"(Unranked)",
+                                            TextSize = 30,
+                                            Margin = new MarginPadding
                                             {
-                                                Font = @"Exo2.0-Bold",
-                                                TextSize = 30,
-                                                Margin = new MarginPadding
-                                                {
-                                                    Top = 5
-                                                }
-                                            },
-                                            UnrankedLabel = new OsuSpriteText
-                                            {
-                                                Font = @"Exo2.0-Bold",
-                                                Text = @"(Unranked)",
-                                                TextSize = 30,
-                                                Margin = new MarginPadding
-                                                {
-                                                    Top = 5,
-                                                    Left = 10
-                                                }
+                                                Top = 5,
+                                                Left = 10
                                             }
                                         }
                                     }
-                                },
-                            }
+                                }
+                            },
                         },
                     },
                 },

osu.Game/Overlays/Mods/Sections/AutomationSection.cs

@@ -1,19 +0,0 @@
-// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using osu.Game.Rulesets.Mods;
-using OpenTK.Input;
-
-namespace osu.Game.Overlays.Mods.Sections
-{
-    public class AutomationSection : ModSection
-    {
-        protected override Key[] ToggleKeys => new[] { Key.Z, Key.X, Key.C, Key.V, Key.B, Key.N, Key.M };
-        public override ModType ModType => ModType.Automation;
-
-        public AutomationSection()
-        {
-            Header = @"Automation";
-        }
-    }
-}

osu.Game/Overlays/Mods/Sections/ConversionSection.cs

@@ -1,19 +0,0 @@
-// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using osu.Game.Rulesets.Mods;
-using OpenTK.Input;
-
-namespace osu.Game.Overlays.Mods.Sections
-{
-    public class ConversionSection : ModSection
-    {
-        protected override Key[] ToggleKeys => null;
-        public override ModType ModType => ModType.Conversion;
-
-        public ConversionSection()
-        {
-            Header = @"Conversion";
-        }
-    }
-}

osu.Game/Overlays/Mods/Sections/FunSection.cs

@@ -1,19 +0,0 @@
-// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using osu.Game.Rulesets.Mods;
-using OpenTK.Input;
-
-namespace osu.Game.Overlays.Mods.Sections
-{
-    public class FunSection : ModSection
-    {
-        protected override Key[] ToggleKeys => null;
-        public override ModType ModType => ModType.Fun;
-
-        public FunSection()
-        {
-            Header = @"Fun";
-        }
-    }
-}

osu.Game/Overlays/Mods/SpecialSection.cs

@@ -0,0 +1,27 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using OpenTK.Input;
+using osu.Framework.Allocation;
+using osu.Game.Graphics;
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Overlays.Mods
+{
+    public class SpecialSection : ModSection
+    {
+        protected override Key[] ToggleKeys => new[] { Key.Z, Key.X, Key.C, Key.V, Key.B, Key.N, Key.M };
+        public override ModType ModType => ModType.Special;
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            SelectedColour = colours.BlueLight;
+        }
+
+        public SpecialSection()
+        {
+            Header = @"Special";
+        }
+    }
+}

osu.Game/Overlays/UserProfileOverlay.cs

@@ -195,7 +195,7 @@ namespace osu.Game.Overlays
                 TabContainer.AutoSizeAxes |= Axes.X;
                 TabContainer.Anchor |= Anchor.x1;
                 TabContainer.Origin |= Anchor.x1;
-                AddInternal(bottom = new Box
+                Add(bottom = new Box
                 {
                     RelativeSizeAxes = Axes.X,
                     Height = 1,

osu.Game/Rulesets/Mods/Mod.cs

@@ -29,7 +29,7 @@ namespace osu.Game.Rulesets.Mods
         /// <summary>
         /// The type of this mod.
         /// </summary>
-        public virtual ModType Type => ModType.Fun;
+        public virtual ModType Type => ModType.Special;
 
         /// <summary>
         /// The user readable description of this mod.

osu.Game/Rulesets/Mods/ModAutoplay.cs

@@ -26,7 +26,6 @@ namespace osu.Game.Rulesets.Mods
         public override string Name => "Autoplay";
         public override string ShortenedName => "AT";
         public override FontAwesome Icon => FontAwesome.fa_osu_mod_auto;
-        public override ModType Type => ModType.Automation;
         public override string Description => "Watch a perfect automated play through the song.";
         public override double ScoreMultiplier => 1;
         public bool AllowFail => false;

osu.Game/Rulesets/Mods/ModRelax.cs

@@ -11,7 +11,6 @@ namespace osu.Game.Rulesets.Mods
         public override string Name => "Relax";
         public override string ShortenedName => "RX";
         public override FontAwesome Icon => FontAwesome.fa_osu_mod_relax;
-        public override ModType Type => ModType.Automation;
         public override double ScoreMultiplier => 1;
         public override Type[] IncompatibleMods => new[] { typeof(ModAutoplay), typeof(ModNoFail), typeof(ModSuddenDeath) };
     }

osu.Game/Rulesets/Mods/ModType.cs

@@ -7,8 +7,6 @@ namespace osu.Game.Rulesets.Mods
     {
         DifficultyReduction,
         DifficultyIncrease,
-        Conversion,
-        Automation,
-        Fun
+        Special
     }
 }

osu.Game/Rulesets/UI/ModIcon.cs

@@ -79,18 +79,10 @@ namespace osu.Game.Rulesets.UI
                     backgroundColour = colours.Green;
                     highlightedColour = colours.GreenLight;
                     break;
-                case ModType.Automation:
+                case ModType.Special:
                     backgroundColour = colours.Blue;
                     highlightedColour = colours.BlueLight;
                     break;
-                case ModType.Conversion:
-                    backgroundColour = colours.Purple;
-                    highlightedColour = colours.PurpleLight;
-                    break;
-                case ModType.Fun:
-                    backgroundColour = colours.Pink;
-                    highlightedColour = colours.PinkLight;
-                    break;
             }
 
             applyStyle();
@@ -100,7 +92,10 @@ namespace osu.Game.Rulesets.UI
 
         public bool Highlighted
         {
-            get { return highlighted; }
+            get
+            {
+                return highlighted;
+            }
 
             set
             {

osu.Game/Screens/Edit/Menus/ScreenSelectionTabControl.cs

@@ -25,7 +25,7 @@ namespace osu.Game.Screens.Edit.Menus
             TabContainer.AutoSizeAxes = Axes.X;
             TabContainer.Padding = new MarginPadding();
 
-            AddInternal(new Box
+            Add(new Box
             {
                 Anchor = Anchor.BottomLeft,
                 Origin = Anchor.BottomLeft,

osu.Game/Screens/Play/Player.cs

@@ -213,7 +213,7 @@ namespace osu.Game.Screens.Play
                     {
                         if (!IsCurrentScreen) return;
 
-                        fadeOut(true);
+                        pauseContainer.Hide();
                         Restart();
                     },
                 }
@@ -278,8 +278,6 @@ namespace osu.Game.Screens.Play
                     ScoreProcessor.PopulateScore(score);
                     score.User = RulesetContainer.Replay?.User ?? api.LocalUser.Value;
                     Push(new Results(score));
-
-                    onCompletionEvent = null;
                 });
             }
         }
@@ -342,13 +340,6 @@ namespace osu.Game.Screens.Play
 
         protected override bool OnExiting(Screen next)
         {
-            if (onCompletionEvent != null)
-            {
-                // Proceed to result screen if beatmap already finished playing
-                onCompletionEvent.RunTask();
-                return true;
-            }
-
             if ((!AllowPause || HasFailed || !ValidForResume || pauseContainer?.IsPaused != false || RulesetContainer?.HasReplayLoaded != false) && (!pauseContainer?.IsResuming ?? true))
             {
                 // In the case of replays, we may have changed the playback rate.
@@ -364,10 +355,16 @@ namespace osu.Game.Screens.Play
             return true;
         }
 
-        private void fadeOut(bool instant = false)
+        private void fadeOut()
         {
-            float fadeOutDuration = instant ? 0 : 250;
-            Content.FadeOut(fadeOutDuration);
+            const float fade_out_duration = 250;
+
+            RulesetContainer?.FadeOut(fade_out_duration);
+            Content.FadeOut(fade_out_duration);
+
+            hudOverlay?.ScaleTo(0.7f, fade_out_duration * 3, Easing.In);
+
+            Background?.FadeTo(1f, fade_out_duration);
         }
 
         protected override bool OnScroll(InputState state) => mouseWheelDisabled.Value && !pauseContainer.IsPaused;

osu.Game/Screens/Play/PlayerLoader.cs

@@ -1,12 +1,12 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System.Linq;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Input.EventArgs;
 using osu.Framework.Input.States;
 using osu.Framework.Localisation;
 using osu.Framework.Screens;
@@ -22,8 +22,6 @@ namespace osu.Game.Screens.Play
 {
     public class PlayerLoader : ScreenWithBeatmapBackground
     {
-        private static readonly Vector2 background_blur = new Vector2(15);
-
         private Player player;
 
         private BeatmapMetadataDisplay info;
@@ -64,7 +62,7 @@ namespace osu.Game.Screens.Play
                 Margin = new MarginPadding(25),
                 Children = new PlayerSettingsGroup[]
                 {
-                    visualSettings = new VisualSettings(),
+                    new VisualSettings(),
                     new InputSettings()
                 }
             });
@@ -125,33 +123,23 @@ namespace osu.Game.Screens.Play
             logo.Delay(resuming ? 0 : 500).MoveToOffset(new Vector2(0, -0.24f), 500, Easing.InOutExpo);
         }
 
+        private bool weHandledMouseDown;
+
+        protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
+        {
+            weHandledMouseDown = true;
+            return base.OnMouseDown(state, args);
+        }
+
+        protected override bool OnMouseUp(InputState state, MouseUpEventArgs args)
+        {
+            weHandledMouseDown = false;
+            return base.OnMouseUp(state, args);
+        }
+
         private ScheduledDelegate pushDebounce;
-        private VisualSettings visualSettings;
 
-        private bool readyForPush => player.LoadState == LoadState.Ready && IsHovered && GetContainingInputManager()?.DraggedDrawable == null;
-
-        protected override bool OnHover(InputState state)
-        {
-            // restore our screen defaults
-            InitializeBackgroundElements();
-            return base.OnHover(state);
-        }
-
-        protected override void OnHoverLost(InputState state)
-        {
-            if (GetContainingInputManager().HoveredDrawables.Contains(visualSettings))
-            {
-                // show user setting preview
-                UpdateBackgroundElements();
-            }
-            base.OnHoverLost(state);
-        }
-
-        protected override void InitializeBackgroundElements()
-        {
-            Background?.FadeTo(1, BACKGROUND_FADE_DURATION, Easing.OutQuint);
-            Background?.BlurTo(background_blur, BACKGROUND_FADE_DURATION, Easing.OutQuint);
-        }
+        private bool readyForPush => player.LoadState == LoadState.Ready && IsHovered && (!GetContainingInputManager().CurrentState.Mouse.HasAnyButtonPressed || weHandledMouseDown);
 
         private void pushWhenLoaded()
         {
@@ -243,7 +231,7 @@ namespace osu.Game.Screens.Play
                             Anchor = Anchor.TopCentre,
                             Origin = Anchor.TopRight,
                             Margin = new MarginPadding { Right = 5 },
-                            Colour = OsuColour.Gray(0.8f),
+                            Colour = OsuColour.Gray(0.5f),
                             Text = left,
                         },
                         new OsuSpriteText

osu.Game/Screens/Play/PlayerSettings/PlayerSettingsGroup.cs

@@ -128,27 +128,6 @@ namespace osu.Game.Screens.Play.PlayerSettings
             };
         }
 
-        private const float fade_duration = 800;
-        private const float inactive_alpha = 0.5f;
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-            this.Delay(600).FadeTo(inactive_alpha, fade_duration, Easing.OutQuint);
-        }
-
-        protected override bool OnHover(InputState state)
-        {
-            this.FadeIn(fade_duration, Easing.OutQuint);
-            return true;
-        }
-
-        protected override void OnHoverLost(InputState state)
-        {
-            this.FadeTo(inactive_alpha, fade_duration, Easing.OutQuint);
-            base.OnHoverLost(state);
-        }
-
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
@@ -161,6 +140,7 @@ namespace osu.Game.Screens.Play.PlayerSettings
 
         protected override Container<Drawable> Content => content;
 
+        protected override bool OnHover(InputState state) => true;
         protected override bool OnMouseDown(InputState state, MouseDownEventArgs args) => true;
     }
 }

osu.Game/Screens/Play/ScreenWithBeatmapBackground.cs

@@ -15,8 +15,6 @@ namespace osu.Game.Screens.Play
     {
         protected override BackgroundScreen CreateBackground() => new BackgroundScreenBeatmap(Beatmap.Value);
 
-        protected new BackgroundScreenBeatmap Background => (BackgroundScreenBeatmap)base.Background;
-
         public override bool AllowBeatmapRulesetChange => false;
 
         protected const float BACKGROUND_FADE_DURATION = 800;
@@ -45,30 +43,21 @@ namespace osu.Game.Screens.Play
             DimLevel.ValueChanged += _ => UpdateBackgroundElements();
             BlurLevel.ValueChanged += _ => UpdateBackgroundElements();
             ShowStoryboard.ValueChanged += _ => UpdateBackgroundElements();
-            InitializeBackgroundElements();
+            UpdateBackgroundElements();
         }
 
         protected override void OnResuming(Screen last)
         {
             base.OnResuming(last);
-            InitializeBackgroundElements();
+            UpdateBackgroundElements();
         }
 
-        /// <summary>
-        /// Called once on entering screen. By Default, performs a full <see cref="UpdateBackgroundElements"/> call.
-        /// </summary>
-        protected virtual void InitializeBackgroundElements() => UpdateBackgroundElements();
-
-        /// <summary>
-        /// Called wen background elements require updates, usually due to a user changing a setting.
-        /// </summary>
-        /// <param name="userChange"></param>
         protected virtual void UpdateBackgroundElements()
         {
             if (!IsCurrentScreen) return;
 
             Background?.FadeTo(BackgroundOpacity, BACKGROUND_FADE_DURATION, Easing.OutQuint);
-            Background?.BlurTo(new Vector2((float)BlurLevel.Value * 25), BACKGROUND_FADE_DURATION, Easing.OutQuint);
+            (Background as BackgroundScreenBeatmap)?.BlurTo(new Vector2((float)BlurLevel.Value * 25), BACKGROUND_FADE_DURATION, Easing.OutQuint);
         }
     }
 }

osu.Game/Screens/Play/SkipOverlay.cs

@@ -4,8 +4,6 @@
 using System;
 using osu.Framework;
 using osu.Framework.Allocation;
-using osu.Framework.Audio;
-using osu.Framework.Audio.Sample;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Threading;
@@ -216,21 +214,17 @@ namespace osu.Game.Screens.Play
             private Box background;
             private AspectContainer aspect;
 
-            private SampleChannel sampleConfirm;
-
             public Button()
             {
                 RelativeSizeAxes = Axes.Both;
             }
 
             [BackgroundDependencyLoader]
-            private void load(OsuColour colours, AudioManager audio)
+            private void load(OsuColour colours)
             {
                 colourNormal = colours.Yellow;
                 colourHover = colours.YellowDark;
 
-                sampleConfirm = audio.Sample.Get(@"SongSelect/confirm-selection");
-
                 Children = new Drawable[]
                 {
                     background = new Box
@@ -317,8 +311,6 @@ namespace osu.Game.Screens.Play
                 if (!Enabled)
                     return false;
 
-                sampleConfirm.Play();
-
                 box.FlashColour(Color4.White, 500, Easing.OutQuint);
                 aspect.ScaleTo(1.2f, 2000, Easing.OutQuint);
 

osu.Game/Screens/Select/SongSelect.cs

@@ -69,7 +69,7 @@ namespace osu.Game.Screens.Select
         private SampleChannel sampleChangeDifficulty;
         private SampleChannel sampleChangeBeatmap;
 
-        protected new readonly Bindable<RulesetInfo> Ruleset = new Bindable<RulesetInfo>();
+        public new readonly Bindable<RulesetInfo> Ruleset = new Bindable<RulesetInfo>();
 
         private DependencyContainer dependencies;
 

osu.Game/osu.Game.csproj

@@ -18,8 +18,8 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.1" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.1.1" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
-    <PackageReference Include="ppy.osu.Framework" Version="2018.803.0" />
-    <PackageReference Include="SharpCompress" Version="0.22.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2018.730.0" />
+    <PackageReference Include="SharpCompress" Version="0.17.1" />
     <PackageReference Include="NUnit" Version="3.10.1" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0" />
   </ItemGroup>

osu.Game/osu.nuspec

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
+    <metadata>
+        <id>osulazer</id>
+        <version>0.0.0</version>
+        <title>osulazer</title>
+        <authors>ppy Pty Ltd</authors>
+        <owners>Dean Herbert</owners>
+        <projectUrl>https://osu.ppy.sh/</projectUrl>
+        <iconUrl>https://puu.sh/tYyXZ/9a01a5d1b0.ico</iconUrl>
+        <requireLicenseAcceptance>false</requireLicenseAcceptance>
+        <description>click the circles. to the beat.</description>
+        <summary>click the circles.</summary>
+        <releaseNotes>testing</releaseNotes>
+        <copyright>Copyright ppy Pty Ltd 2007-2018</copyright>
+        <language>en-AU</language>
+    </metadata>
+    <files>
+      <file src="*.exe" target="lib\net45\" exclude="**vshost**"/>
+      <file src="*.dll" target="lib\net45\"/>
+      <file src="*.config" target="lib\net45\"/>
+      <file src="x86\*.dll" target="lib\net45\x86\"/>
+      <file src="x64\*.dll" target="lib\net45\x64\"/>
+    </files>
+</package>
+

osu.TestProject.props

@@ -13,6 +13,9 @@
   <ItemGroup Label="Package References">
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.1" />
     <PackageReference Include="DeepEqual" Version="1.6.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
+    <PackageReference Include="NUnit" Version="3.10.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\osu.Game\Tests\VisualTestRunner.cs">