Merge remote-tracking branch 'upstream/master' into reverse-arrows

.gitignore

@@ -331,3 +331,6 @@ fastlane/report.xml
 # inspectcode
 inspectcodereport.xml
 inspectcode
+
+# BenchmarkDotNet
+/BenchmarkDotNet.Artifacts

.idea/.idea.osu.Desktop/.idea/runConfigurations/Benchmarks.xml

@@ -0,0 +1,20 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Benchmarks" type="DotNetProject" factoryName=".NET Project">
+    <option name="EXE_PATH" value="$PROJECT_DIR$/osu.Game.Benchmarks/bin/Release/netcoreapp3.1/osu.Game.Benchmarks.dll" />
+    <option name="PROGRAM_PARAMETERS" value="--filter *" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/osu.Game.Benchmarks/bin/Release/netcoreapp3.1" />
+    <option name="PASS_PARENT_ENVS" value="1" />
+    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="USE_MONO" value="0" />
+    <option name="RUNTIME_ARGUMENTS" value="" />
+    <option name="PROJECT_PATH" value="$PROJECT_DIR$/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj" />
+    <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
+    <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
+    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
+    <option name="PROJECT_KIND" value="DotNetCore" />
+    <option name="PROJECT_TFM" value=".NETCoreApp,Version=v3.1" />
+    <method v="2">
+      <option name="Build" enabled="true" />
+    </method>
+  </configuration>
+</component>

.vscode/launch.json

@@ -1,6 +1,7 @@
 {
     "version": "0.2.0",
-    "configurations": [{
+    "configurations": [
+        {
             "name": "osu! (Debug)",
             "type": "coreclr",
             "request": "launch",
@@ -50,7 +51,8 @@
                 }
             },
             "console": "internalConsole"
-        }, {
+        },
+        {
             "name": "osu! (Tests, Release)",
             "type": "coreclr",
             "request": "launch",
@@ -139,6 +141,19 @@
             },
             "console": "internalConsole"
         },
+        {
+            "name": "Benchmark",
+            "type": "coreclr",
+            "request": "launch",
+            "program": "${workspaceRoot}/osu.Game.Benchmarks/bin/Release/netcoreapp3.1/osu.Game.Benchmarks.dll",
+            "args": [
+                "--filter",
+                "*"
+            ],
+            "cwd": "${workspaceRoot}",
+            "preLaunchTask": "Build benchmarks",
+            "console": "internalConsole"
+        },
         {
             "name": "Cake: Debug Script",
             "type": "coreclr",

.vscode/tasks.json

@@ -2,7 +2,8 @@
     // See https://go.microsoft.com/fwlink/?LinkId=733558
     // for the documentation about the tasks.json format
     "version": "2.0.0",
-    "tasks": [{
+    "tasks": [
+        {
             "label": "Build osu! (Debug)",
             "type": "shell",
             "command": "dotnet",
@@ -78,7 +79,8 @@
             ],
             "group": "build",
             "problemMatcher": "$msCompile"
-        }, {
+        },
+        {
             "label": "Build tournament tests (Release)",
             "type": "shell",
             "command": "dotnet",
@@ -94,6 +96,22 @@
             "group": "build",
             "problemMatcher": "$msCompile"
         },
+        {
+            "label": "Build benchmarks",
+            "type": "shell",
+            "command": "dotnet",
+            "args": [
+                "build",
+                "--no-restore",
+                "osu.Game.Benchmarks",
+                "/p:Configuration=Release",
+                "/p:GenerateFullPaths=true",
+                "/m",
+                "/verbosity:m"
+            ],
+            "group": "build",
+            "problemMatcher": "$msCompile"
+        },
         {
             "label": "Restore (netcoreapp3.1)",
             "type": "shell",

osu.Android.props

@@ -54,6 +54,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2019.1230.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2019.1227.1" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.111.0" />
   </ItemGroup>
 </Project>

osu.Desktop.slnf

@@ -3,6 +3,7 @@
     "path": "osu.sln",
     "projects": [
       "osu.Desktop\\osu.Desktop.csproj",
+      "osu.Game.Benchmarks\\osu.Game.Benchmarks.csproj",
       "osu.Game.Rulesets.Catch.Tests\\osu.Game.Rulesets.Catch.Tests.csproj",
       "osu.Game.Rulesets.Catch\\osu.Game.Rulesets.Catch.csproj",
       "osu.Game.Rulesets.Mania.Tests\\osu.Game.Rulesets.Mania.Tests.csproj",

osu.Desktop/DiscordRichPresence.cs

@@ -75,6 +75,9 @@ namespace osu.Desktop
 
         private void updateStatus()
         {
+            if (!client.IsInitialized)
+                return;
+
             if (status.Value is UserStatusOffline)
             {
                 client.ClearPresence();

osu.Game.Benchmarks/BenchmarkBeatmapParsing.cs

@@ -0,0 +1,37 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.IO;
+using BenchmarkDotNet.Attributes;
+using osu.Framework.IO.Stores;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.Formats;
+using osu.Game.IO;
+using osu.Game.IO.Archives;
+using osu.Game.Resources;
+
+namespace osu.Game.Benchmarks
+{
+    public class BenchmarkBeatmapParsing : BenchmarkTest
+    {
+        private readonly MemoryStream beatmapStream = new MemoryStream();
+
+        public override void SetUp()
+        {
+            using (var resources = new DllResourceStore(OsuResources.ResourceAssembly))
+            using (var archive = resources.GetStream("Beatmaps/241526 Soleily - Renatus.osz"))
+            using (var reader = new ZipArchiveReader(archive))
+                reader.GetStream("Soleily - Renatus (Gamu) [Insane].osu").CopyTo(beatmapStream);
+        }
+
+        [Benchmark]
+        public Beatmap BenchmarkBundledBeatmap()
+        {
+            beatmapStream.Seek(0, SeekOrigin.Begin);
+            var reader = new LineBufferedReader(beatmapStream); // no disposal
+
+            var decoder = Decoder.GetDecoder<Beatmap>(reader);
+            return decoder.Decode(reader);
+        }
+    }
+}

osu.Game.Benchmarks/BenchmarkTest.cs

@@ -0,0 +1,23 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using BenchmarkDotNet.Attributes;
+using BenchmarkDotNet.Running;
+using NUnit.Framework;
+
+namespace osu.Game.Benchmarks
+{
+    [TestFixture]
+    [MemoryDiagnoser]
+    public abstract class BenchmarkTest
+    {
+        [GlobalSetup]
+        [OneTimeSetUp]
+        public virtual void SetUp()
+        {
+        }
+
+        [Test]
+        public void RunBenchmark() => BenchmarkRunner.Run(GetType());
+    }
+}

osu.Game.Benchmarks/Program.cs

@@ -0,0 +1,17 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using BenchmarkDotNet.Running;
+
+namespace osu.Game.Benchmarks
+{
+    public static class Program
+    {
+        public static void Main(string[] args)
+        {
+            BenchmarkSwitcher
+                .FromAssembly(typeof(Program).Assembly)
+                .Run(args);
+        }
+    }
+}

osu.Game.Benchmarks/Properties/launchSettings.json

@@ -0,0 +1,8 @@
+{
+  "profiles": {
+    "All Benchmarks": {
+      "commandName": "Project",
+      "commandLineArgs": "--filter *"
+    }
+  }
+}

osu.Game.Benchmarks/osu.Game.Benchmarks.csproj

@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="BenchmarkDotNet" Version="0.12.0" />
+    <PackageReference Include="nunit" Version="3.12.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\osu.Game\osu.Game.csproj" />
+  </ItemGroup>
+
+</Project>

osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs

@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using Newtonsoft.Json;
 using NUnit.Framework;
-using osu.Framework.MathUtils;
+using osu.Framework.Utils;
 using osu.Game.Rulesets.Catch.Mods;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.UI;

osu.Game.Rulesets.Catch/Judgements/CatchBananaJudgement.cs

@@ -30,7 +30,7 @@ namespace osu.Game.Rulesets.Catch.Judgements
                     return 0;
 
                 case HitResult.Perfect:
-                    return 0.008;
+                    return 0.01;
             }
         }
 

osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs

@@ -18,17 +18,5 @@ namespace osu.Game.Rulesets.Catch.Judgements
                     return 30;
             }
         }
-
-        protected override double HealthIncreaseFor(HitResult result)
-        {
-            switch (result)
-            {
-                default:
-                    return base.HealthIncreaseFor(result);
-
-                case HitResult.Perfect:
-                    return 0.007;
-            }
-        }
     }
 }

osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs

@@ -23,18 +23,6 @@ namespace osu.Game.Rulesets.Catch.Judgements
             }
         }
 
-        protected override double HealthIncreaseFor(HitResult result)
-        {
-            switch (result)
-            {
-                default:
-                    return -0.02;
-
-                case HitResult.Perfect:
-                    return 0.01;
-            }
-        }
-
         /// <summary>
         /// Whether fruit on the platter should explode or drop.
         /// Note that this is only checked if the owning object is also <see cref="IHasComboInformation.LastInCombo" />

osu.Game.Rulesets.Catch/Judgements/CatchTinyDropletJudgement.cs

@@ -29,7 +29,7 @@ namespace osu.Game.Rulesets.Catch.Judgements
                     return 0;
 
                 case HitResult.Perfect:
-                    return 0.004;
+                    return 0.02;
             }
         }
     }

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

@@ -8,7 +8,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
-using osu.Framework.MathUtils;
+using osu.Framework.Utils;
 using osu.Game.Rulesets.Catch.Objects.Drawable.Pieces;
 using osuTK;
 using osuTK.Graphics;

osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs

@@ -3,7 +3,7 @@
 
 using System;
 using System.Linq;
-using osu.Framework.MathUtils;
+using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Replays;
 using osu.Game.Rulesets.Catch.Beatmaps;

osu.Game.Rulesets.Catch/Replays/CatchFramedReplayInputHandler.cs

@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using osu.Framework.Input.StateChanges;
-using osu.Framework.MathUtils;
+using osu.Framework.Utils;
 using osu.Game.Replays;
 using osu.Game.Rulesets.Replays;
 

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

@@ -7,7 +7,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Bindings;
-using osu.Framework.MathUtils;
+using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Catch.Judgements;
 using osu.Game.Rulesets.Catch.Objects;

osu.Game.Rulesets.Mania.Tests/ManiaBeatmapConversionTest.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 using NUnit.Framework;
-using osu.Framework.MathUtils;
+using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Objects;

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

@@ -5,7 +5,7 @@ using osu.Game.Rulesets.Mania.Objects;
 using System;
 using System.Linq;
 using System.Collections.Generic;
-using osu.Framework.MathUtils;
+using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;

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

@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using osu.Framework.MathUtils;
+using osu.Framework.Utils;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mania.MathUtils;

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

@@ -15,11 +15,11 @@ namespace osu.Game.Rulesets.Mania.Judgements
         {
             switch (result)
             {
-                case HitResult.Miss:
+                default:
                     return 0;
 
-                default:
+                case HitResult.Perfect:
-                    return 0.040;
+                    return 0.01;
             }
         }
     }

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

@@ -29,32 +29,5 @@ namespace osu.Game.Rulesets.Mania.Judgements
                     return 300;
             }
         }
-
-        protected override double HealthIncreaseFor(HitResult result)
-        {
-            switch (result)
-            {
-                case HitResult.Miss:
-                    return -0.125;
-
-                case HitResult.Meh:
-                    return 0.005;
-
-                case HitResult.Ok:
-                    return 0.010;
-
-                case HitResult.Good:
-                    return 0.035;
-
-                case HitResult.Great:
-                    return 0.055;
-
-                case HitResult.Perfect:
-                    return 0.065;
-
-                default:
-                    return 0;
-            }
-        }
     }
 }

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

@@ -4,7 +4,7 @@
 using System.Linq;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.MathUtils;
+using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Mania.Beatmaps;

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

@@ -1,68 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using osu.Framework.Extensions.Color4Extensions;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Effects;
-using osu.Framework.Graphics.Shapes;
-using osu.Game.Graphics;
-using osuTK.Graphics;
-
-namespace osu.Game.Rulesets.Mania.Objects.Drawables.Pieces
-{
-    public class GlowPiece : CompositeDrawable, IHasAccentColour
-    {
-        private const float glow_alpha = 0.7f;
-        private const float glow_radius = 5;
-
-        public GlowPiece()
-        {
-            RelativeSizeAxes = Axes.Both;
-            Masking = true;
-
-            InternalChild = new Box
-            {
-                RelativeSizeAxes = Axes.Both,
-                Alpha = 0,
-                AlwaysPresent = true
-            };
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-            updateGlow();
-        }
-
-        private Color4 accentColour;
-
-        public Color4 AccentColour
-        {
-            get => accentColour;
-            set
-            {
-                if (accentColour == value)
-                    return;
-
-                accentColour = value;
-
-                updateGlow();
-            }
-        }
-
-        private void updateGlow()
-        {
-            if (!IsLoaded)
-                return;
-
-            EdgeEffect = new EdgeEffectParameters
-            {
-                Type = EdgeEffectType.Glow,
-                Colour = AccentColour.Opacity(glow_alpha),
-                Radius = glow_radius,
-                Hollow = true
-            };
-        }
-    }
-}

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

@@ -1,85 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using osuTK.Graphics;
-using osu.Framework.Extensions.Color4Extensions;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Colour;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
-using osu.Game.Graphics;
-
-namespace osu.Game.Rulesets.Mania.Objects.Drawables.Pieces
-{
-    public class LaneGlowPiece : CompositeDrawable, IHasAccentColour
-    {
-        private const float total_height = 100;
-        private const float glow_height = 50;
-        private const float glow_alpha = 0.4f;
-        private const float edge_alpha = 0.3f;
-
-        public LaneGlowPiece()
-        {
-            BypassAutoSizeAxes = Axes.Both;
-            RelativeSizeAxes = Axes.X;
-            Height = total_height;
-
-            InternalChildren = new[]
-            {
-                new Container
-                {
-                    Name = "Left edge",
-                    RelativeSizeAxes = Axes.Y,
-                    Width = 1,
-                    Children = createGradient(edge_alpha)
-                },
-                new Container
-                {
-                    Name = "Right edge",
-                    Anchor = Anchor.TopRight,
-                    Origin = Anchor.TopRight,
-                    RelativeSizeAxes = Axes.Y,
-                    Width = 1,
-                    Children = createGradient(edge_alpha)
-                },
-                new Container
-                {
-                    Name = "Glow",
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    RelativeSizeAxes = Axes.X,
-                    Height = glow_height,
-                    Children = createGradient(glow_alpha)
-                }
-            };
-        }
-
-        private Drawable[] createGradient(float alpha) => new Drawable[]
-        {
-            new Box
-            {
-                Name = "Top",
-                RelativeSizeAxes = Axes.Both,
-                Height = 0.5f,
-                Blending = BlendingParameters.Additive,
-                Colour = ColourInfo.GradientVertical(Color4.Transparent, Color4.White.Opacity(alpha))
-            },
-            new Box
-            {
-                Name = "Bottom",
-                Anchor = Anchor.BottomLeft,
-                Origin = Anchor.BottomLeft,
-                RelativeSizeAxes = Axes.Both,
-                Height = 0.5f,
-                Blending = BlendingParameters.Additive,
-                Colour = ColourInfo.GradientVertical(Color4.White.Opacity(alpha), Color4.Transparent)
-            }
-        };
-
-        public Color4 AccentColour
-        {
-            get => Colour;
-            set => Colour = value;
-        }
-    }
-}

osu.Game.Rulesets.Mania/UI/Components/ColumnHitObjectArea.cs

@@ -18,8 +18,6 @@ namespace osu.Game.Rulesets.Mania.UI.Components
 {
     public class ColumnHitObjectArea : CompositeDrawable, IHasAccentColour
     {
-        private const float hit_target_bar_height = 2;
-
         private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
 
         private readonly Drawable hitTarget;
@@ -67,6 +65,8 @@ namespace osu.Game.Rulesets.Mania.UI.Components
 
         private class DefaultHitTarget : CompositeDrawable, IHasAccentColour
         {
+            private const float hit_target_bar_height = 2;
+
             private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
 
             private readonly Container hitTargetLine;

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

@@ -5,7 +5,7 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
-using osu.Framework.MathUtils;
+using osu.Framework.Utils;
 using osu.Game.Rulesets.Mania.Objects.Drawables.Pieces;
 using osuTK;
 using osuTK.Graphics;

osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 using NUnit.Framework;
-using osu.Framework.MathUtils;
+using osu.Framework.Utils;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Tests.Beatmaps;

osu.Game.Rulesets.Osu.Tests/TestSceneOsuDistanceSnapGrid.cs

@@ -9,7 +9,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
-using osu.Framework.MathUtils;
+using osu.Framework.Utils;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Osu.Beatmaps;

osu.Game.Rulesets.Osu.Tests/TestSceneShaking.cs

@@ -2,7 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Diagnostics;
-using osu.Framework.MathUtils;
+using osu.Framework.Utils;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Scoring;
 

osu.Game.Rulesets.Osu.Tests/TestSceneSliderSelectionBlueprint.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 using NUnit.Framework;
-using osu.Framework.MathUtils;
+using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Objects;

osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs

@@ -4,7 +4,7 @@
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
-using osu.Framework.MathUtils;
+using osu.Framework.Utils;
 using osu.Framework.Testing;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;

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

@@ -4,7 +4,7 @@
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.16.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
   <PropertyGroup Label="Project">

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

@@ -8,7 +8,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Input;
 using osu.Framework.Input.Events;
-using osu.Framework.MathUtils;
+using osu.Framework.Utils;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;

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

@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Framework.MathUtils;
+using osu.Framework.Utils;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables.Pieces;
 using osu.Game.Rulesets.Scoring;
@@ -110,7 +110,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 break;
             }
 
-            float aimRotation = MathHelper.RadiansToDegrees(MathF.Atan2(aimRotationVector.Y - Position.Y, aimRotationVector.X - Position.X));
+            float aimRotation = MathUtils.RadiansToDegrees(MathF.Atan2(aimRotationVector.Y - Position.Y, aimRotationVector.X - Position.X));
             while (Math.Abs(aimRotation - Rotation) > 180)
                 aimRotation += aimRotation < Rotation ? 360 : -360;
 

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

@@ -125,7 +125,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
         private void setRange(double p0, double p1)
         {
             if (p0 > p1)
-                MathHelper.Swap(ref p0, ref p1);
+                (p0, p1) = (p1, p0);
 
             if (SnakedStart == p0 && SnakedEnd == p1) return;
 

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

@@ -8,6 +8,7 @@ using osu.Framework.Input.Events;
 using osu.Game.Graphics;
 using osuTK;
 using osuTK.Graphics;
+using osu.Framework.Utils;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 {
@@ -93,7 +94,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
         {
             base.Update();
 
-            var thisAngle = -(float)MathHelper.RadiansToDegrees(Math.Atan2(mousePosition.X - DrawSize.X / 2, mousePosition.Y - DrawSize.Y / 2));
+            var thisAngle = -MathUtils.RadiansToDegrees(MathF.Atan2(mousePosition.X - DrawSize.X / 2, mousePosition.Y - DrawSize.Y / 2));
 
             bool validAndTracking = tracking && spinner.StartTime <= Time.Current && spinner.EndTime > Time.Current;
 

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

@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.MathUtils;
+using osu.Framework.Utils;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 

osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs

@@ -2,7 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osuTK;
-using osu.Framework.MathUtils;
+using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Osu.Objects;
 using System;

osu.Game.Rulesets.Osu/Replays/OsuFramedReplayInputHandler.cs

@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using osu.Framework.Input.StateChanges;
-using osu.Framework.MathUtils;
+using osu.Framework.Utils;
 using osu.Game.Replays;
 using osu.Game.Rulesets.Replays;
 using osuTK;

osu.Game.Rulesets.Osu/Skinning/LegacySliderBody.cs

@@ -3,7 +3,7 @@
 
 using System;
 using osu.Framework.Extensions.Color4Extensions;
-using osu.Framework.MathUtils;
+using osu.Framework.Utils;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables.Pieces;
 using osuTK.Graphics;

osu.Game.Rulesets.Taiko.Tests/TaikoBeatmapConversionTest.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 using NUnit.Framework;
-using osu.Framework.MathUtils;
+using osu.Framework.Utils;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Taiko.Objects;
 using osu.Game.Tests.Beatmaps;

osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoPlayfield.cs

@@ -7,7 +7,7 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.MathUtils;
+using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Judgements;

osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableDrumRoll.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Linq;
 using osu.Framework.Allocation;
-using osu.Framework.MathUtils;
+using osu.Framework.Utils;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
 using osuTK.Graphics;

osu.Game.Tests/Gameplay/TestSceneDrainingHealthProcessor.cs

@@ -4,7 +4,7 @@
 using NUnit.Framework;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Framework.MathUtils;
+using osu.Framework.Utils;
 using osu.Framework.Testing;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;

osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs

@@ -8,6 +8,7 @@ using NUnit.Framework;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
 using osu.Framework.IO.Stores;
+using osu.Framework.Testing;
 using osu.Game.Audio;
 using osu.Game.Skinning;
 using osu.Game.Tests.Resources;
@@ -15,6 +16,7 @@ using osu.Game.Tests.Visual;
 
 namespace osu.Game.Tests.Gameplay
 {
+    [HeadlessTest]
     public class TestSceneStoryboardSamples : OsuTestScene
     {
         [Test]

osu.Game.Tests/Online/TestSceneBeatmapManager.cs

@@ -0,0 +1,51 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Testing;
+using osu.Game.Beatmaps;
+using osu.Game.Overlays.Notifications;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Tests.Online
+{
+    [HeadlessTest]
+    public class TestSceneBeatmapManager : OsuTestScene
+    {
+        private BeatmapManager beatmaps;
+        private ProgressNotification recentNotification;
+
+        private static readonly BeatmapSetInfo test_model = new BeatmapSetInfo { OnlineBeatmapSetID = 1 };
+
+        [BackgroundDependencyLoader]
+        private void load(BeatmapManager beatmaps)
+        {
+            this.beatmaps = beatmaps;
+
+            beatmaps.PostNotification = n => recentNotification = n as ProgressNotification;
+        }
+
+        [Test]
+        public void TestCancelDownloadFromRequest()
+        {
+            AddStep("download beatmap", () => beatmaps.Download(test_model));
+
+            AddStep("cancel download from request", () => beatmaps.GetExistingDownload(test_model).Cancel());
+
+            AddUntilStep("is removed from download list", () => beatmaps.GetExistingDownload(test_model) == null);
+            AddAssert("is notification cancelled", () => recentNotification.State == ProgressNotificationState.Cancelled);
+        }
+
+        [Test]
+        public void TestCancelDownloadFromNotification()
+        {
+            AddStep("download beatmap", () => beatmaps.Download(test_model));
+
+            AddStep("cancel download from notification", () => recentNotification.Close());
+
+            AddUntilStep("is removed from download list", () => beatmaps.GetExistingDownload(test_model) == null);
+            AddAssert("is notification cancelled", () => recentNotification.State == ProgressNotificationState.Cancelled);
+        }
+    }
+}

osu.Game.Tests/Visual/Editor/TestSceneZoomableScrollContainer.cs

@@ -7,7 +7,7 @@ using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Shapes;
-using osu.Framework.MathUtils;
+using osu.Framework.Utils;
 using osu.Framework.Testing;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Cursor;

osu.Game.Tests/Visual/Gameplay/TestSceneBarHitErrorMeter.cs

@@ -6,7 +6,7 @@ using osu.Game.Rulesets.Objects;
 using System;
 using System.Collections.Generic;
 using osu.Game.Rulesets.Judgements;
-using osu.Framework.MathUtils;
+using osu.Framework.Utils;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics.Sprites;

osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs

@@ -10,7 +10,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input;
-using osu.Framework.MathUtils;
+using osu.Framework.Utils;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;

osu.Game.Tests/Visual/Gameplay/TestSceneGameplayRewinding.cs

@@ -7,7 +7,7 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Track;
-using osu.Framework.MathUtils;
+using osu.Framework.Utils;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets;

osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs

@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Graphics;
-using osu.Framework.MathUtils;
+using osu.Framework.Utils;
 using osu.Game.Screens.Play;
 using osuTK.Input;
 

osu.Game.Tests/Visual/Gameplay/TestSceneLeadIn.cs

@@ -5,7 +5,7 @@ using System.Diagnostics;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Graphics;
-using osu.Framework.MathUtils;
+using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets.Osu;

osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs

@@ -12,7 +12,7 @@ using osu.Framework.Audio;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.MathUtils;
+using osu.Framework.Utils;
 using osu.Framework.Screens;
 using osu.Game.Configuration;
 using osu.Game.Graphics.Containers;
@@ -146,6 +146,18 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddAssert("player mods applied", () => playerMod2.Applied);
         }
 
+        [Test]
+        public void TestModDisplayChanges()
+        {
+            var testMod = new TestMod();
+
+            AddStep("load player", () => ResetPlayer(true));
+
+            AddUntilStep("wait for loader to become current", () => loader.IsCurrentScreen());
+            AddStep("set test mod in loader", () => loader.Mods.Value = new[] { testMod });
+            AddAssert("test mod is displayed", () => (TestMod)loader.DisplayedMods.Single() == testMod);
+        }
+
         [Test]
         public void TestMutedNotificationMasterVolume() => addVolumeSteps("master volume", () => audioManager.Volume.Value = 0, null, () => audioManager.Volume.IsDefault);
 
@@ -221,6 +233,8 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             public new Task DisposalTask => base.DisposalTask;
 
+            public IReadOnlyList<Mod> DisplayedMods => MetadataInfo.Mods.Value;
+
             public TestPlayerLoader(Func<Player> createPlayer)
                 : base(createPlayer)
             {

osu.Game.Tests/Visual/Gameplay/TestSceneScoreCounter.cs

@@ -4,7 +4,7 @@
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.MathUtils;
+using osu.Framework.Utils;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Screens.Play.HUD;

osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs

@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Framework.MathUtils;
+using osu.Framework.Utils;
 using osu.Framework.Timing;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Screens.Play;

osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapPanel.cs

@@ -7,7 +7,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.Multi.Match.Components;
 using osu.Framework.Graphics;
-using osu.Framework.MathUtils;
+using osu.Framework.Utils;
 using osu.Game.Audio;
 using osu.Framework.Allocation;
 

osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlayDetails.cs

@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Graphics;
-using osu.Framework.MathUtils;
+using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Overlays.BeatmapSet;
 using osu.Game.Screens.Select.Details;

osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlaySuccessRate.cs

@@ -8,7 +8,7 @@ using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osu.Framework.MathUtils;
+using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Overlays.BeatmapSet;
 using osu.Game.Screens.Select.Details;

osu.Game.Tests/Visual/Online/TestSceneChannelTabControl.cs

@@ -9,7 +9,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.MathUtils;
+using osu.Framework.Utils;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Online.Chat;
 using osu.Game.Overlays.Chat.Tabs;

osu.Game.Tests/Visual/Online/TestSceneScoresContainer.cs

@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osu.Framework.MathUtils;
+using osu.Framework.Utils;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Overlays.BeatmapSet.Scores;
 using osu.Game.Rulesets.Osu.Mods;

osu.Game.Tests/Visual/Online/TestSceneTotalCommentsCounter.cs

@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using osu.Framework.Graphics;
 using osu.Framework.Bindables;
 using osu.Game.Overlays.Comments;
-using osu.Framework.MathUtils;
+using osu.Framework.Utils;
 
 namespace osu.Game.Tests.Visual.Online
 {

osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboard.cs

@@ -3,10 +3,13 @@
 
 using System;
 using System.Collections.Generic;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Leaderboards;
+using osu.Game.Overlays;
+using osu.Game.Online.Placeholders;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Scoring;
 using osu.Game.Screens.Select.Leaderboards;
@@ -28,8 +31,16 @@ namespace osu.Game.Tests.Visual.SongSelect
 
         private readonly FailableLeaderboard leaderboard;
 
+        [Cached]
+        private readonly DialogOverlay dialogOverlay;
+
         public TestSceneBeatmapLeaderboard()
         {
+            Add(dialogOverlay = new DialogOverlay
+            {
+                Depth = -1
+            });
+
             Add(leaderboard = new FailableLeaderboard
             {
                 Origin = Anchor.Centre,

osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs

@@ -11,7 +11,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions;
-using osu.Framework.MathUtils;
+using osu.Framework.Utils;
 using osu.Framework.Platform;
 using osu.Framework.Screens;
 using osu.Game.Beatmaps;

osu.Game.Tests/Visual/SongSelect/TestSceneUserTopScoreContainer.cs

@@ -1,11 +1,13 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osuTK.Graphics;
 using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Overlays;
 using osu.Game.Scoring;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Screens.Select.Leaderboards;
@@ -15,10 +17,18 @@ namespace osu.Game.Tests.Visual.SongSelect
 {
     public class TestSceneUserTopScoreContainer : OsuTestScene
     {
+        [Cached]
+        private readonly DialogOverlay dialogOverlay;
+
         public TestSceneUserTopScoreContainer()
         {
             UserTopScoreContainer topScoreContainer;
 
+            Add(dialogOverlay = new DialogOverlay
+            {
+                Depth = -1
+            });
+
             Add(new Container
             {
                 Origin = Anchor.BottomCentre,

osu.Game.Tests/Visual/UserInterface/TestSceneCursors.cs

@@ -8,7 +8,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
-using osu.Framework.MathUtils;
+using osu.Framework.Utils;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Graphics.Sprites;
 using osuTK;

osu.Game.Tests/Visual/UserInterface/TestSceneDeleteLocalScore.cs

@@ -0,0 +1,181 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+using osu.Framework.Graphics;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics.Cursor;
+using osu.Framework.Platform;
+using osu.Framework.Testing;
+using osu.Framework.Utils;
+using osu.Game.Beatmaps;
+using osu.Game.Graphics.Cursor;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Online.Leaderboards;
+using osu.Game.Online.Placeholders;
+using osu.Game.Overlays;
+using osu.Game.Rulesets;
+using osu.Game.Scoring;
+using osu.Game.Screens.Select.Leaderboards;
+using osu.Game.Tests.Resources;
+using osu.Game.Users;
+using osuTK;
+using osuTK.Input;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    public class TestSceneDeleteLocalScore : ManualInputManagerTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(Placeholder),
+            typeof(MessagePlaceholder),
+            typeof(RetrievalFailurePlaceholder),
+            typeof(UserTopScoreContainer),
+            typeof(Leaderboard<BeatmapLeaderboardScope, ScoreInfo>),
+            typeof(LeaderboardScore),
+        };
+
+        private readonly ContextMenuContainer contextMenuContainer;
+        private readonly BeatmapLeaderboard leaderboard;
+
+        private RulesetStore rulesetStore;
+        private BeatmapManager beatmapManager;
+        private ScoreManager scoreManager;
+
+        private readonly List<ScoreInfo> scores = new List<ScoreInfo>();
+        private BeatmapInfo beatmap;
+
+        [Cached]
+        private readonly DialogOverlay dialogOverlay;
+
+        public TestSceneDeleteLocalScore()
+        {
+            Children = new Drawable[]
+            {
+                contextMenuContainer = new OsuContextMenuContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Child = leaderboard = new BeatmapLeaderboard
+                    {
+                        Origin = Anchor.Centre,
+                        Anchor = Anchor.Centre,
+                        Size = new Vector2(550f, 450f),
+                        Scope = BeatmapLeaderboardScope.Local,
+                        Beatmap = new BeatmapInfo
+                        {
+                            ID = 1,
+                            Metadata = new BeatmapMetadata
+                            {
+                                ID = 1,
+                                Title = "TestSong",
+                                Artist = "TestArtist",
+                                Author = new User
+                                {
+                                    Username = "TestAuthor"
+                                },
+                            },
+                            Version = "Insane"
+                        },
+                    }
+                },
+                dialogOverlay = new DialogOverlay()
+            };
+        }
+
+        protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
+        {
+            var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
+
+            dependencies.Cache(rulesetStore = new RulesetStore(ContextFactory));
+            dependencies.Cache(beatmapManager = new BeatmapManager(LocalStorage, ContextFactory, rulesetStore, null, Audio, dependencies.Get<GameHost>(), Beatmap.Default));
+            dependencies.Cache(scoreManager = new ScoreManager(rulesetStore, () => beatmapManager, LocalStorage, null, ContextFactory));
+
+            beatmap = beatmapManager.Import(TestResources.GetTestBeatmapForImport()).Result.Beatmaps[0];
+
+            for (int i = 0; i < 50; i++)
+            {
+                var score = new ScoreInfo
+                {
+                    OnlineScoreID = i,
+                    Beatmap = beatmap,
+                    BeatmapInfoID = beatmap.ID,
+                    Accuracy = RNG.NextDouble(),
+                    TotalScore = RNG.Next(1, 1000000),
+                    MaxCombo = RNG.Next(1, 1000),
+                    Rank = ScoreRank.XH,
+                    User = new User { Username = "TestUser" },
+                };
+
+                scores.Add(scoreManager.Import(score).Result);
+            }
+
+            scores.Sort(Comparer<ScoreInfo>.Create((s1, s2) => s2.TotalScore.CompareTo(s1.TotalScore)));
+
+            return dependencies;
+        }
+
+        [SetUp]
+        public void Setup() => Schedule(() =>
+        {
+            // Due to soft deletions, we can re-use deleted scores between test runs
+            scoreManager.Undelete(scoreManager.QueryScores(s => s.DeletePending).ToList());
+
+            leaderboard.Scores = null;
+            leaderboard.FinishTransforms(true); // After setting scores, we may be waiting for transforms to expire drawables
+
+            leaderboard.Beatmap = beatmap;
+            leaderboard.RefreshScores(); // Required in the case that the beatmap hasn't changed
+        });
+
+        [SetUpSteps]
+        public void SetupSteps()
+        {
+            // Ensure the leaderboard has finished async-loading drawables
+            AddUntilStep("wait for drawables", () => leaderboard.ChildrenOfType<LeaderboardScore>().Any());
+
+            // Ensure the leaderboard items have finished showing up
+            AddStep("finish transforms", () => leaderboard.FinishTransforms(true));
+        }
+
+        [Test]
+        public void TestDeleteViaRightClick()
+        {
+            AddStep("open menu for top score", () =>
+            {
+                InputManager.MoveMouseTo(leaderboard.ChildrenOfType<LeaderboardScore>().First());
+                InputManager.Click(MouseButton.Right);
+            });
+
+            // Ensure the context menu has finished showing
+            AddStep("finish transforms", () => contextMenuContainer.FinishTransforms(true));
+
+            AddStep("click delete option", () =>
+            {
+                InputManager.MoveMouseTo(contextMenuContainer.ChildrenOfType<DrawableOsuMenuItem>().First(i => i.Item.Text.Value.ToLowerInvariant() == "delete"));
+                InputManager.Click(MouseButton.Left);
+            });
+
+            // Ensure the dialog has finished showing
+            AddStep("finish transforms", () => dialogOverlay.FinishTransforms(true));
+
+            AddStep("click delete button", () =>
+            {
+                InputManager.MoveMouseTo(dialogOverlay.ChildrenOfType<DialogButton>().First());
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddUntilStep("score removed from leaderboard", () => leaderboard.Scores.All(s => s.OnlineScoreID != scores[0].OnlineScoreID));
+        }
+
+        [Test]
+        public void TestDeleteViaDatabase()
+        {
+            AddStep("delete top score", () => scoreManager.Delete(scores[0]));
+            AddUntilStep("score removed from leaderboard", () => leaderboard.Scores.All(s => s.OnlineScoreID != scores[0].OnlineScoreID));
+        }
+    }
+}

osu.Game.Tests/Visual/UserInterface/TestSceneLogoTrackingContainer.cs

@@ -8,7 +8,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.UserInterface;
-using osu.Framework.MathUtils;
+using osu.Framework.Utils;
 using osu.Framework.Testing;
 using osu.Game.Graphics.Containers;
 using osu.Game.Screens.Menu;

osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs

@@ -8,7 +8,7 @@ using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.MathUtils;
+using osu.Framework.Utils;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;

osu.Game.Tests/Visual/UserInterface/TestSceneNowPlayingOverlay.cs

@@ -4,8 +4,10 @@
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Framework.Timing;
+using osu.Framework.Utils;
+using osu.Game.Beatmaps;
 using osu.Game.Overlays;
+using osu.Game.Rulesets.Osu;
 
 namespace osu.Game.Tests.Visual.UserInterface
 {
@@ -15,22 +17,48 @@ namespace osu.Game.Tests.Visual.UserInterface
         [Cached]
         private MusicController musicController = new MusicController();
 
-        public TestSceneNowPlayingOverlay()
+        private WorkingBeatmap currentBeatmap;
-        {
-            Clock = new FramedClock();
 
-            var np = new NowPlayingOverlay
+        private NowPlayingOverlay nowPlayingOverlay;
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Beatmap.Value = CreateWorkingBeatmap(new OsuRuleset().RulesetInfo);
+
+            nowPlayingOverlay = new NowPlayingOverlay
             {
                 Origin = Anchor.Centre,
                 Anchor = Anchor.Centre
             };
 
             Add(musicController);
-            Add(np);
+            Add(nowPlayingOverlay);
+        }
 
-            AddStep(@"show", () => np.Show());
+        [Test]
+        public void TestShowHideDisable()
+        {
+            AddStep(@"show", () => nowPlayingOverlay.Show());
             AddToggleStep(@"toggle beatmap lock", state => Beatmap.Disabled = state);
-            AddStep(@"show", () => np.Hide());
+            AddStep(@"hide", () => nowPlayingOverlay.Hide());
+        }
+
+        [Test]
+        public void TestPrevTrackBehavior()
+        {
+            AddStep(@"Play track", () =>
+            {
+                musicController.NextTrack();
+                currentBeatmap = Beatmap.Value;
+            });
+
+            AddStep(@"Seek track to 6 second", () => musicController.SeekTo(6000));
+            AddUntilStep(@"Wait for current time to update", () => currentBeatmap.Track.CurrentTime > 5000);
+            AddAssert(@"Check action is restart track", () => musicController.PreviousTrack() == PreviousTrackResult.Restart);
+            AddUntilStep("Wait for current time to update", () => Precision.AlmostEquals(currentBeatmap.Track.CurrentTime, 0));
+            AddAssert(@"Check track didn't change", () => currentBeatmap == Beatmap.Value);
+            AddAssert(@"Check action is not restart", () => musicController.PreviousTrack() != PreviousTrackResult.Restart);
         }
     }
 }

osu.Game.Tests/Visual/UserInterface/TestSceneToolbarRulesetSelector.cs

@@ -9,7 +9,7 @@ using osu.Framework.Graphics;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
-using osu.Framework.MathUtils;
+using osu.Framework.Utils;
 using osu.Game.Rulesets;
 
 namespace osu.Game.Tests.Visual.UserInterface

osu.Game.Tournament.Tests/Components/TestSceneMatchScoreDisplay.cs

@@ -3,7 +3,7 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Framework.MathUtils;
+using osu.Framework.Utils;
 using osu.Game.Tournament.IPC;
 using osu.Game.Tournament.Screens.Gameplay.Components;
 

osu.Game.Tournament/Screens/Drawings/Components/VisualiserContainer.cs

@@ -8,7 +8,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
-using osu.Framework.MathUtils;
+using osu.Framework.Utils;
 
 namespace osu.Game.Tournament.Screens.Drawings.Components
 {

osu.Game/Beatmaps/Drawables/DifficultyIcon.cs

@@ -48,11 +48,9 @@ namespace osu.Game.Beatmaps.Drawables
             InternalChild = iconContainer = new Container { Size = new Vector2(20f) };
         }
 
-        public string TooltipText { get; set; }
-
         public ITooltip GetCustomTooltip() => new DifficultyIconTooltip();
 
-        public object TooltipContent { get; set; }
+        public object TooltipContent { get; }
 
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)

osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs

@@ -12,6 +12,7 @@ using osu.Framework.Graphics;
 using osu.Game.IO;
 using osu.Game.Storyboards;
 using osu.Game.Beatmaps.Legacy;
+using osu.Framework.Utils;
 
 namespace osu.Game.Beatmaps.Formats
 {
@@ -190,7 +191,7 @@ namespace osu.Game.Beatmaps.Formats
                             {
                                 var startValue = float.Parse(split[4], CultureInfo.InvariantCulture);
                                 var endValue = split.Length > 5 ? float.Parse(split[5], CultureInfo.InvariantCulture) : startValue;
-                                timelineGroup?.Rotation.Add(easing, startTime, endTime, MathHelper.RadiansToDegrees(startValue), MathHelper.RadiansToDegrees(endValue));
+                                timelineGroup?.Rotation.Add(easing, startTime, endTime, MathUtils.RadiansToDegrees(startValue), MathUtils.RadiansToDegrees(endValue));
                                 break;
                             }
 

osu.Game/Database/DownloadableArchiveModelManager.cs

@@ -92,8 +92,6 @@ namespace osu.Game.Database
             notification.CancelRequested += () =>
             {
                 request.Cancel();
-                currentDownloads.Remove(request);
-                notification.State = ProgressNotificationState.Cancelled;
                 return true;
             };
 
@@ -109,11 +107,11 @@ namespace osu.Game.Database
             {
                 DownloadFailed?.Invoke(request);
 
-                if (error is OperationCanceledException) return;
-
-                notification.State = ProgressNotificationState.Cancelled;
-                Logger.Error(error, $"{HumanisedModelName.Titleize()} download failed!");
                 currentDownloads.Remove(request);
+                notification.State = ProgressNotificationState.Cancelled;
+
+                if (!(error is OperationCanceledException))
+                    Logger.Error(error, $"{HumanisedModelName.Titleize()} download failed!");
             }
         }
 

osu.Game/Graphics/Backgrounds/Triangles.cs

@@ -2,7 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics;
-using osu.Framework.MathUtils;
+using osu.Framework.Utils;
 using osuTK;
 using osuTK.Graphics;
 using System;
@@ -29,8 +29,33 @@ namespace osu.Game.Graphics.Backgrounds
         /// </summary>
         private const float edge_smoothness = 1;
 
-        public Color4 ColourLight = Color4.White;
+        private Color4 colourLight = Color4.White;
-        public Color4 ColourDark = Color4.Black;
+
+        public Color4 ColourLight
+        {
+            get => colourLight;
+            set
+            {
+                if (colourLight == value) return;
+
+                colourLight = value;
+                updateColours();
+            }
+        }
+
+        private Color4 colourDark = Color4.Black;
+
+        public Color4 ColourDark
+        {
+            get => colourDark;
+            set
+            {
+                if (colourDark == value) return;
+
+                colourDark = value;
+                updateColours();
+            }
+        }
 
         /// <summary>
         /// Whether we want to expire triangles as they exit our draw area completely.
@@ -151,7 +176,8 @@ namespace osu.Game.Graphics.Backgrounds
             TriangleParticle particle = CreateTriangle();
 
             particle.Position = new Vector2(RNG.NextSingle(), randomY ? RNG.NextSingle() : 1);
-            particle.Colour = CreateTriangleShade();
+            particle.ColourShade = RNG.NextSingle();
+            particle.Colour = CreateTriangleShade(particle.ColourShade);
 
             return particle;
         }
@@ -177,7 +203,17 @@ namespace osu.Game.Graphics.Backgrounds
         /// Creates a shade of colour for the triangles.
         /// </summary>
         /// <returns>The colour.</returns>
-        protected virtual Color4 CreateTriangleShade() => Interpolation.ValueAt(RNG.NextSingle(), ColourDark, ColourLight, 0, 1);
+        protected virtual Color4 CreateTriangleShade(float shade) => Interpolation.ValueAt(shade, colourDark, colourLight, 0, 1);
+
+        private void updateColours()
+        {
+            for (int i = 0; i < parts.Count; i++)
+            {
+                TriangleParticle newParticle = parts[i];
+                newParticle.Colour = CreateTriangleShade(newParticle.ColourShade);
+                parts[i] = newParticle;
+            }
+        }
 
         protected override DrawNode CreateDrawNode() => new TrianglesDrawNode(this);
 
@@ -264,6 +300,12 @@ namespace osu.Game.Graphics.Backgrounds
             /// </summary>
             public Vector2 Position;
 
+            /// <summary>
+            /// The colour shade of the triangle.
+            /// This is needed for colour recalculation of visible triangles when <see cref="ColourDark"/> or <see cref="ColourLight"/> is changed.
+            /// </summary>
+            public float ColourShade;
+
             /// <summary>
             /// The colour of the triangle.
             /// </summary>

osu.Game/Graphics/Containers/LogoTrackingContainer.cs

@@ -4,7 +4,7 @@
 using System;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.MathUtils;
+using osu.Framework.Utils;
 using osu.Game.Screens.Menu;
 using osuTK;
 

osu.Game/Graphics/Containers/OsuScrollContainer.cs

@@ -123,8 +123,6 @@ namespace osu.Game.Graphics.Containers
 
                 Masking = true;
                 Child = box = new Box { RelativeSizeAxes = Axes.Both };
-
-                ResizeTo(1);
             }
 
             [BackgroundDependencyLoader]

osu.Game/Graphics/Containers/ParallaxContainer.cs

@@ -9,7 +9,7 @@ using osuTK;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Configuration;
-using osu.Framework.MathUtils;
+using osu.Framework.Utils;
 
 namespace osu.Game.Graphics.Containers
 {

osu.Game/Graphics/Cursor/MenuCursor.cs

@@ -14,6 +14,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Input.Events;
 using osuTK.Input;
+using osu.Framework.Utils;
 
 namespace osu.Game.Graphics.Cursor
 {
@@ -55,7 +56,7 @@ namespace osu.Game.Graphics.Cursor
                 if (dragRotationState == DragRotationState.Rotating && distance > 0)
                 {
                     Vector2 offset = e.MousePosition - positionMouseDown;
-                    float degrees = (float)MathHelper.RadiansToDegrees(Math.Atan2(-offset.X, offset.Y)) + 24.3f;
+                    float degrees = MathUtils.RadiansToDegrees(MathF.Atan2(-offset.X, offset.Y)) + 24.3f;
 
                     // Always rotate in the direction of least distance
                     float diff = (degrees - activeCursor.Rotation) % 360;

osu.Game/Graphics/UserInterface/DimmedLoadingLayer.cs

@@ -7,6 +7,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Extensions.Color4Extensions;
 using osuTK;
+using osu.Framework.Input.Events;
 
 namespace osu.Game.Graphics.UserInterface
 {
@@ -41,5 +42,17 @@ namespace osu.Game.Graphics.UserInterface
             this.FadeOut(transition_duration, Easing.OutQuint);
             loading.Hide();
         }
+
+        protected override bool Handle(UIEvent e)
+        {
+            switch (e)
+            {
+                // blocking scroll can cause weird behaviour when this layer is used within a ScrollContainer.
+                case ScrollEvent _:
+                    return false;
+            }
+
+            return base.Handle(e);
+        }
     }
 }

osu.Game/Graphics/UserInterface/OsuTabControl.cs

@@ -15,7 +15,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
-using osu.Framework.MathUtils;
+using osu.Framework.Utils;
 using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Graphics.UserInterface

osu.Game/Graphics/UserInterface/StarCounter.cs

@@ -4,7 +4,7 @@
 using osuTK;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.MathUtils;
+using osu.Framework.Utils;
 using System;
 using System.Linq;
 using osu.Framework.Graphics.Sprites;

osu.Game/Input/Bindings/GlobalActionContainer.cs

@@ -24,6 +24,7 @@ namespace osu.Game.Input.Bindings
 
         public IEnumerable<KeyBinding> GlobalKeyBindings => new[]
         {
+            new KeyBinding(InputKey.F6, GlobalAction.ToggleNowPlaying),
             new KeyBinding(InputKey.F8, GlobalAction.ToggleChat),
             new KeyBinding(InputKey.F9, GlobalAction.ToggleSocial),
             new KeyBinding(InputKey.F10, GlobalAction.ToggleGameplayMouseButtons),
@@ -32,6 +33,7 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(new[] { InputKey.Control, InputKey.Alt, InputKey.R }, GlobalAction.ResetInputSettings),
             new KeyBinding(new[] { InputKey.Control, InputKey.T }, GlobalAction.ToggleToolbar),
             new KeyBinding(new[] { InputKey.Control, InputKey.O }, GlobalAction.ToggleSettings),
+            new KeyBinding(new[] { InputKey.Control, InputKey.D }, GlobalAction.ToggleDirect),
 
             new KeyBinding(InputKey.Escape, GlobalAction.Back),
             new KeyBinding(InputKey.ExtraMouseButton1, GlobalAction.Back),
@@ -136,5 +138,8 @@ namespace osu.Game.Input.Bindings
 
         [Description("Play / pause")]
         MusicPlay,
+
+        [Description("Toggle now playing overlay")]
+        ToggleNowPlaying,
     }
 }

osu.Game/Online/API/APIRequest.cs

@@ -14,7 +14,7 @@ namespace osu.Game.Online.API
     /// <typeparam name="T">Type of the response (used for deserialisation).</typeparam>
     public abstract class APIRequest<T> : APIRequest
     {
-        protected override WebRequest CreateWebRequest() => new JsonWebRequest<T>(Uri);
+        protected override WebRequest CreateWebRequest() => new OsuJsonWebRequest<T>(Uri);
 
         public T Result => ((JsonWebRequest<T>)WebRequest).ResponseObject;
 
@@ -30,6 +30,16 @@ namespace osu.Game.Online.API
         /// This will be scheduled to the API's internal scheduler (run on update thread automatically).
         /// </summary>
         public new event APISuccessHandler<T> Success;
+
+        private class OsuJsonWebRequest<U> : JsonWebRequest<U>
+        {
+            public OsuJsonWebRequest(string uri)
+                : base(uri)
+            {
+            }
+
+            protected override string UserAgent => "osu!";
+        }
     }
 
     /// <summary>
@@ -39,7 +49,7 @@ namespace osu.Game.Online.API
     {
         protected abstract string Target { get; }
 
-        protected virtual WebRequest CreateWebRequest() => new WebRequest(Uri);
+        protected virtual WebRequest CreateWebRequest() => new OsuWebRequest(Uri);
 
         protected virtual string Uri => $@"{API.Endpoint}/api/v2/{Target}";
 
@@ -152,6 +162,16 @@ namespace osu.Game.Online.API
             [JsonProperty("error")]
             public string ErrorMessage { get; set; }
         }
+
+        private class OsuWebRequest : WebRequest
+        {
+            public OsuWebRequest(string uri)
+                : base(uri)
+            {
+            }
+
+            protected override string UserAgent => "osu!";
+        }
     }
 
     public class APIException : InvalidOperationException

osu.Game/Online/API/Requests/MarkChannelAsReadRequest.cs

@@ -0,0 +1,30 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Net.Http;
+using osu.Framework.IO.Network;
+using osu.Game.Online.Chat;
+
+namespace osu.Game.Online.API.Requests
+{
+    public class MarkChannelAsReadRequest : APIRequest
+    {
+        private readonly Channel channel;
+        private readonly Message message;
+
+        public MarkChannelAsReadRequest(Channel channel, Message message)
+        {
+            this.channel = channel;
+            this.message = message;
+        }
+
+        protected override string Target => $"chat/channels/{channel.Id}/mark-as-read/{message.Id}";
+
+        protected override WebRequest CreateWebRequest()
+        {
+            var req = base.CreateWebRequest();
+            req.Method = HttpMethod.Put;
+            return req;
+        }
+    }
+}

osu.Game/Online/Chat/Channel.cs

@@ -36,6 +36,11 @@ namespace osu.Game.Online.Chat
         /// </summary>
         public readonly SortedList<Message> Messages = new SortedList<Message>(Comparer<Message>.Default);
 
+        /// <summary>
+        /// Contains all the messages that weren't read by the user.
+        /// </summary>
+        public IEnumerable<Message> UnreadMessages => Messages.Where(m => LastReadId < m.Id);
+
         /// <summary>
         /// Contains all the messages that are still pending for submission to the server.
         /// </summary>
@@ -75,6 +80,9 @@ namespace osu.Game.Online.Chat
         [JsonProperty(@"last_message_id")]
         public long? LastMessageId;
 
+        [JsonProperty(@"last_read_id")]
+        public long? LastReadId;
+
         /// <summary>
         /// Signalles if the current user joined this channel or not. Defaults to false.
         /// </summary>

osu.Game/Online/Chat/ChannelManager.cs

@@ -445,6 +445,28 @@ namespace osu.Game.Online.Chat
             return tcs.Task;
         }
 
+        /// <summary>
+        /// Marks the <paramref name="channel"/> as read
+        /// </summary>
+        /// <param name="channel">The channel that will be marked as read</param>
+        public void MarkChannelAsRead(Channel channel)
+        {
+            if (channel.LastMessageId == channel.LastReadId)
+                return;
+
+            var message = channel.Messages.LastOrDefault();
+
+            if (message == null)
+                return;
+
+            var req = new MarkChannelAsReadRequest(channel, message);
+
+            req.Success += () => channel.LastReadId = message.Id;
+            req.Failure += e => Logger.Error(e, $"Failed to mark channel {channel} up to '{message}' as read");
+
+            api.Queue(req);
+        }
+
         [BackgroundDependencyLoader]
         private void load(IAPIProvider api)
         {

osu.Game/Online/Leaderboards/Leaderboard.cs

@@ -12,8 +12,10 @@ using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Threading;
 using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Cursor;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API;
+using osu.Game.Online.Placeholders;
 using osuTK;
 using osuTK.Graphics;
 
@@ -150,7 +152,7 @@ namespace osu.Game.Online.Leaderboards
                         break;
 
                     case PlaceholderState.NotLoggedIn:
-                        replacePlaceholder(new MessagePlaceholder(@"Please sign in to view online leaderboards!"));
+                        replacePlaceholder(new LoginPlaceholder());
                         break;
 
                     case PlaceholderState.NotSupporter:
@@ -180,10 +182,14 @@ namespace osu.Game.Online.Leaderboards
                     {
                         new Drawable[]
                         {
-                            scrollContainer = new OsuScrollContainer
+                            new OsuContextMenuContainer
                             {
                                 RelativeSizeAxes = Axes.Both,
-                                ScrollbarVisible = false,
+                                Child = scrollContainer = new OsuScrollContainer
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                    ScrollbarVisible = false,
+                                }
                             }
                         },
                         new Drawable[]

osu.Game/Online/Leaderboards/LeaderboardScore.cs

@@ -11,11 +11,15 @@ using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Overlays;
 using osu.Game.Rulesets.UI;
+using osu.Game.Screens.Select;
 using osu.Game.Scoring;
 using osu.Game.Users.Drawables;
 using osuTK;
@@ -25,7 +29,7 @@ using osu.Game.Online.API;
 
 namespace osu.Game.Online.Leaderboards
 {
-    public class LeaderboardScore : OsuClickableContainer
+    public class LeaderboardScore : OsuClickableContainer, IHasContextMenu
     {
         public const float HEIGHT = 60;
 
@@ -51,6 +55,9 @@ namespace osu.Game.Online.Leaderboards
 
         private List<ScoreComponentLabel> statisticsLabels;
 
+        [Resolved]
+        private DialogOverlay dialogOverlay { get; set; }
+
         public LeaderboardScore(ScoreInfo score, int rank, bool allowHighlight = true)
         {
             this.score = score;
@@ -359,5 +366,18 @@ namespace osu.Game.Online.Leaderboards
                 Value = value;
             }
         }
+
+        public MenuItem[] ContextMenuItems
+        {
+            get
+            {
+                List<MenuItem> items = new List<MenuItem>();
+
+                if (score.ID != 0)
+                    items.Add(new OsuMenuItem("Delete", MenuItemType.Destructive, () => dialogOverlay?.Push(new LocalScoreDeleteDialog(score))));
+
+                return items.ToArray();
+            }
+        }
     }
 }

osu.Game/Online/Leaderboards/RetrievalFailurePlaceholder.cs

@@ -6,6 +6,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics.Containers;
+using osu.Game.Online.Placeholders;
 using osuTK;
 
 namespace osu.Game.Online.Leaderboards

osu.Game/Online/Placeholders/LoginPlaceholder.cs

@@ -0,0 +1,46 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Input.Events;
+using osu.Game.Overlays;
+
+namespace osu.Game.Online.Placeholders
+{
+    public sealed class LoginPlaceholder : Placeholder
+    {
+        [Resolved(CanBeNull = true)]
+        private LoginOverlay login { get; set; }
+
+        public LoginPlaceholder()
+        {
+            AddIcon(FontAwesome.Solid.UserLock, cp =>
+            {
+                cp.Font = cp.Font.With(size: TEXT_SIZE);
+                cp.Padding = new MarginPadding { Right = 10 };
+            });
+
+            AddText(@"Please sign in to view online leaderboards!");
+        }
+
+        protected override bool OnMouseDown(MouseDownEvent e)
+        {
+            this.ScaleTo(0.8f, 4000, Easing.OutQuint);
+            return base.OnMouseDown(e);
+        }
+
+        protected override bool OnMouseUp(MouseUpEvent e)
+        {
+            this.ScaleTo(1, 1000, Easing.OutElastic);
+            return base.OnMouseUp(e);
+        }
+
+        protected override bool OnClick(ClickEvent e)
+        {
+            login?.Show();
+            return base.OnClick(e);
+        }
+    }
+}

osu.Game/Online/Placeholders/MessagePlaceholder.cs

@@ -4,7 +4,7 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 
-namespace osu.Game.Online.Leaderboards
+namespace osu.Game.Online.Placeholders
 {
     public class MessagePlaceholder : Placeholder
     {

osu.Game/Online/Placeholders/Placeholder.cs

@@ -5,7 +5,7 @@ using System;
 using osu.Framework.Graphics;
 using osu.Game.Graphics.Containers;
 
-namespace osu.Game.Online.Leaderboards
+namespace osu.Game.Online.Placeholders
 {
     public abstract class Placeholder : OsuTextFlowContainer, IEquatable<Placeholder>
     {

osu.Game/OsuGame.cs

@@ -61,6 +61,8 @@ namespace osu.Game
 
         private NotificationOverlay notifications;
 
+        private NowPlayingOverlay nowPlaying;
+
         private DirectOverlay direct;
 
         private SocialOverlay social;
@@ -624,7 +626,7 @@ namespace osu.Game
                 Origin = Anchor.TopRight,
             }, rightFloatingOverlayContent.Add, true);
 
-            loadComponentSingleFile(new NowPlayingOverlay
+            loadComponentSingleFile(nowPlaying = new NowPlayingOverlay
             {
                 GetToolbarHeight = () => ToolbarOffset,
                 Anchor = Anchor.TopRight,
@@ -822,6 +824,10 @@ namespace osu.Game
 
             switch (action)
             {
+                case GlobalAction.ToggleNowPlaying:
+                    nowPlaying.ToggleVisibility();
+                    return true;
+
                 case GlobalAction.ToggleChat:
                     chatOverlay.ToggleVisibility();
                     return true;