Merge master with conflicts resolved

Directory.Build.props

@@ -18,10 +18,14 @@
     <PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="2.9.7" PrivateAssets="All" />
     <AdditionalFiles Include="$(MSBuildThisFileDirectory)CodeAnalysis\BannedSymbols.txt" />
   </ItemGroup>
+  <PropertyGroup Label="Documentation">
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <NoWarn>$(NoWarn);CS1591</NoWarn>
+  </PropertyGroup>
   <PropertyGroup Label="Project">
     <!-- DeepEqual is not netstandard-compatible. This is fine since we run tests with .NET Framework anyway.
     This is required due to https://github.com/NuGet/Home/issues/5740 -->
-    <NoWarn>NU1701</NoWarn>
+    <NoWarn>$(NoWarn);NU1701</NoWarn>
   </PropertyGroup>
   <PropertyGroup Label="Nuget">
     <Authors>ppy Pty Ltd</Authors>

osu.Android.props

@@ -10,12 +10,14 @@
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
     <AndroidApplication>True</AndroidApplication>
     <AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
-    <TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
     <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AndroidSupportedAbis>armeabi-v7a;x86;arm64-v8a</AndroidSupportedAbis>
     <AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
     <MandroidI18n>cjk,mideast,other,rare,west</MandroidI18n>
+    <AndroidHttpClientHandlerType>System.Net.Http.HttpClientHandler</AndroidHttpClientHandlerType>
+    <AndroidTlsProvider>legacy</AndroidTlsProvider>
     <AndroidLinkMode>SdkOnly</AndroidLinkMode>
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
@@ -53,6 +55,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2019.1010.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2019.1112.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2019.1121.0" />
   </ItemGroup>
 </Project>

osu.Android/Properties/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" package="sh.ppy.osulazer" android:installLocation="auto" android:versionName="0.1.0">
-	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
+	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29" />
 	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 	<uses-permission android:name="android.permission.WAKE_LOCK" />

osu.Game.Rulesets.Catch.Tests.Android/Properties/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="osu.Game.Rulesets.Catch.Tests.Android" android:installLocation="auto">
-	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
+	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29" />
 	<application android:allowBackup="true" android:supportsRtl="true" android:label="osu!catch Test" />
 </manifest>

osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs

@@ -8,7 +8,6 @@ using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Rulesets.Objects.Types;
-using osuTK;
 using osu.Game.Rulesets.Catch.MathUtils;
 using osu.Game.Rulesets.Mods;
 
@@ -78,7 +77,7 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
                             catchObject.XOffset = 0;
 
                             if (catchObject is TinyDroplet)
-                                catchObject.XOffset = MathHelper.Clamp(rng.Next(-20, 20) / CatchPlayfield.BASE_WIDTH, -catchObject.X, 1 - catchObject.X);
+                                catchObject.XOffset = Math.Clamp(rng.Next(-20, 20) / CatchPlayfield.BASE_WIDTH, -catchObject.X, 1 - catchObject.X);
                             else if (catchObject is Droplet)
                                 rng.Next(); // osu!stable retrieved a random droplet rotation
                         }
@@ -230,7 +229,7 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
                 else
                 {
                     currentObject.DistanceToHyperDash = distanceToHyper;
-                    lastExcess = MathHelper.Clamp(distanceToHyper, 0, halfCatcherWidth);
+                    lastExcess = Math.Clamp(distanceToHyper, 0, halfCatcherWidth);
                 }
 
                 lastDirection = thisDirection;

osu.Game.Rulesets.Catch/Difficulty/CatchPerformanceCalculator.cs

@@ -10,7 +10,6 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Scoring.Legacy;
-using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Difficulty
 {
@@ -96,7 +95,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty
             return value;
         }
 
-        private float accuracy() => totalHits() == 0 ? 0 : MathHelper.Clamp((float)totalSuccessfulHits() / totalHits(), 0f, 1f);
+        private float accuracy() => totalHits() == 0 ? 0 : Math.Clamp((float)totalSuccessfulHits() / totalHits(), 0f, 1f);
         private int totalHits() => tinyTicksHit + ticksHit + fruitsHit + misses + tinyTicksMissed;
         private int totalSuccessfulHits() => tinyTicksHit + ticksHit + fruitsHit;
         private int totalComboHits() => misses + ticksHit + fruitsHit;

osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs

@@ -6,7 +6,6 @@ using osu.Game.Rulesets.Catch.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Rulesets.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Difficulty.Skills;
-using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Difficulty.Skills
 {
@@ -31,7 +30,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty.Skills
             if (lastPlayerPosition == null)
                 lastPlayerPosition = catchCurrent.LastNormalizedPosition;
 
-            float playerPosition = MathHelper.Clamp(
+            float playerPosition = Math.Clamp(
                 lastPlayerPosition.Value,
                 catchCurrent.NormalizedPosition - (normalized_hitobject_radius - absolute_player_positioning_error),
                 catchCurrent.NormalizedPosition + (normalized_hitobject_radius - absolute_player_positioning_error)

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

@@ -278,7 +278,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
         {
             base.Update();
 
-            border.Alpha = (float)MathHelper.Clamp((HitObject.StartTime - Time.Current) / 500, 0, 1);
+            border.Alpha = (float)Math.Clamp((HitObject.StartTime - Time.Current) / 500, 0, 1);
         }
 
         private Color4 colourForRepresentation(FruitVisualRepresentation representation)

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

@@ -235,7 +235,7 @@ namespace osu.Game.Rulesets.Catch.UI
                     fruit.Y -= RNG.NextSingle() * diff;
                 }
 
-                fruit.X = MathHelper.Clamp(fruit.X, -CATCHER_SIZE / 2, CATCHER_SIZE / 2);
+                fruit.X = Math.Clamp(fruit.X, -CATCHER_SIZE / 2, CATCHER_SIZE / 2);
 
                 caughtFruit.Add(fruit);
             }
@@ -378,7 +378,7 @@ namespace osu.Game.Rulesets.Catch.UI
                 double speed = BASE_SPEED * dashModifier * hyperDashModifier;
 
                 Scale = new Vector2(Math.Abs(Scale.X) * direction, Scale.Y);
-                X = (float)MathHelper.Clamp(X + direction * Clock.ElapsedFrameTime * speed, 0, 1);
+                X = (float)Math.Clamp(X + direction * Clock.ElapsedFrameTime * speed, 0, 1);
 
                 // Correct overshooting.
                 if ((hyperDashDirection > 0 && hyperDashTargetPosition < X) ||

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

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup Label="Project">
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <OutputType>Library</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Description>catch the fruit. to the beat.</Description>

osu.Game.Rulesets.Mania.Tests.Android/Properties/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="osu.Game.Rulesets.Mania.Tests.Android" android:installLocation="auto">
-	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
+	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29" />
 	<application android:allowBackup="true" android:supportsRtl="true" android:label="osu!mania Test" />
 </manifest>

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

@@ -7,7 +7,6 @@ using JetBrains.Annotations;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mania.MathUtils;
 using osu.Game.Rulesets.Objects;
-using osuTK;
 
 namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
 {
@@ -54,11 +53,11 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
             if (allowSpecial && TotalColumns == 8)
             {
                 const float local_x_divisor = 512f / 7;
-                return MathHelper.Clamp((int)Math.Floor(position / local_x_divisor), 0, 6) + 1;
+                return Math.Clamp((int)Math.Floor(position / local_x_divisor), 0, 6) + 1;
             }
 
             float localXDivisor = 512f / TotalColumns;
-            return MathHelper.Clamp((int)Math.Floor(position / localXDivisor), 0, TotalColumns - 1);
+            return Math.Clamp((int)Math.Floor(position / localXDivisor), 0, TotalColumns - 1);
         }
 
         /// <summary>
@@ -113,7 +112,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
                     drainTime = 10000;
 
                 BeatmapDifficulty difficulty = OriginalBeatmap.BeatmapInfo.BaseDifficulty;
-                conversionDifficulty = ((difficulty.DrainRate + MathHelper.Clamp(difficulty.ApproachRate, 4, 7)) / 1.5 + (double)OriginalBeatmap.HitObjects.Count / drainTime * 9f) / 38f * 5f / 1.15;
+                conversionDifficulty = ((difficulty.DrainRate + Math.Clamp(difficulty.ApproachRate, 4, 7)) / 1.5 + (double)OriginalBeatmap.HitObjects.Count / drainTime * 9f) / 38f * 5f / 1.15;
                 conversionDifficulty = Math.Min(conversionDifficulty.Value, 12);
 
                 return conversionDifficulty.Value;
@@ -139,7 +138,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
         /// <param name="nextColumn">A function to retrieve the next column. If null, a randomisation scheme will be used.</param>
         /// <param name="validation">A function to perform additional validation checks to determine if a column is a valid candidate for a <see cref="HitObject"/>.</param>
         /// <param name="lowerBound">The minimum column index. If null, <see cref="RandomStart"/> is used.</param>
-        /// <param name="upperBound">The maximum column index. If null, <see cref="PatternGenerator.TotalColumns"/> is used.</param>
+        /// <param name="upperBound">The maximum column index. If null, <see cref="Patterns.PatternGenerator.TotalColumns">TotalColumns</see> is used.</param>
         /// <param name="patterns">A list of patterns for which the validity of a column should be checked against.
         /// A column is not a valid candidate if a <see cref="HitObject"/> occupies the same column in any of the patterns.</param>
         /// <returns>A column which has passed the <paramref name="validation"/> check and for which there are no
@@ -184,7 +183,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy
         /// Returns a random column index in the range [<paramref name="lowerBound"/>, <paramref name="upperBound"/>).
         /// </summary>
         /// <param name="lowerBound">The minimum column index. If null, <see cref="RandomStart"/> is used.</param>
-        /// <param name="upperBound">The maximum column index. If null, <see cref="PatternGenerator.TotalColumns"/> is used.</param>
+        /// <param name="upperBound">The maximum column index. If null, <see cref="Patterns.PatternGenerator.TotalColumns"/> is used.</param>
         protected int GetRandomColumn(int? lowerBound = null, int? upperBound = null) => Random.Next(lowerBound ?? RandomStart, upperBound ?? TotalColumns);
 
         /// <summary>

osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs

@@ -1,6 +1,7 @@
 // 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.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Timing;
@@ -9,7 +10,6 @@ using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Screens.Edit.Compose.Components;
-using osuTK;
 
 namespace osu.Game.Rulesets.Mania.Edit
 {
@@ -119,7 +119,7 @@ namespace osu.Game.Rulesets.Mania.Edit
                     maxColumn = obj.Column;
             }
 
-            columnDelta = MathHelper.Clamp(columnDelta, -minColumn, composer.TotalColumns - 1 - maxColumn);
+            columnDelta = Math.Clamp(columnDelta, -minColumn, composer.TotalColumns - 1 - maxColumn);
 
             foreach (var obj in SelectedHitObjects.OfType<ManiaHitObject>())
                 obj.Column += columnDelta;

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

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup Label="Project">
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <OutputType>Library</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Description>smash the keys. to the beat.</Description>

osu.Game.Rulesets.Osu.Tests.Android/Properties/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="osu.Game.Rulesets.Osu.Tests.Android" android:installLocation="auto">
-	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
+	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29" />
 	<application android:allowBackup="true" android:supportsRtl="true" android:label="osu!standard Test" />
 </manifest>

osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs

@@ -14,12 +14,13 @@ using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Osu.Objects;
 using osuTK;
 using osuTK.Graphics;
+using osuTK.Input;
 
 namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
 {
     public class PathControlPointPiece : BlueprintPiece<Slider>
     {
-        public Action<int> RequestSelection;
+        public Action<int, MouseButtonEvent> RequestSelection;
         public Action<Vector2[]> ControlPointsChanged;
 
         public readonly BindableBool IsSelected = new BindableBool();
@@ -129,10 +130,19 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
 
         protected override bool OnMouseDown(MouseDownEvent e)
         {
-            if (RequestSelection != null)
+            if (RequestSelection == null)
+                return false;
+
+            switch (e.Button)
             {
-                RequestSelection.Invoke(Index);
+                case MouseButton.Left:
-                return true;
+                    RequestSelection.Invoke(Index, e);
+                    return true;
+
+                case MouseButton.Right:
+                    if (!IsSelected.Value)
+                        RequestSelection.Invoke(Index, e);
+                    return false; // Allow context menu to show
             }
 
             return false;
@@ -142,7 +152,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
 
         protected override bool OnClick(ClickEvent e) => RequestSelection != null;
 
-        protected override bool OnDragStart(DragStartEvent e) => true;
+        protected override bool OnDragStart(DragStartEvent e) => e.Button == MouseButton.Left;
 
         protected override bool OnDrag(DragEvent e)
         {

osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs

@@ -3,19 +3,25 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using Humanizer;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Cursor;
+using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Screens.Edit.Compose;
 using osuTK;
+using osuTK.Input;
 
 namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
 {
-    public class PathControlPointVisualiser : CompositeDrawable, IKeyBindingHandler<PlatformAction>
+    public class PathControlPointVisualiser : CompositeDrawable, IKeyBindingHandler<PlatformAction>, IHasContextMenu
     {
         public Action<Vector2[]> ControlPointsChanged;
 
@@ -73,9 +79,22 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             return false;
         }
 
-        private void selectPiece(int index)
+        public bool OnPressed(PlatformAction action)
         {
-            if (inputManager.CurrentState.Keyboard.ControlPressed)
+            switch (action.ActionMethod)
+            {
+                case PlatformActionMethod.Delete:
+                    return deleteSelected();
+            }
+
+            return false;
+        }
+
+        public bool OnReleased(PlatformAction action) => action.ActionMethod == PlatformActionMethod.Delete;
+
+        private void selectPiece(int index, MouseButtonEvent e)
+        {
+            if (e.Button == MouseButton.Left && inputManager.CurrentState.Keyboard.ControlPressed)
                 Pieces[index].IsSelected.Toggle();
             else
             {
@@ -84,50 +103,60 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders.Components
             }
         }
 
-        public bool OnPressed(PlatformAction action)
+        private bool deleteSelected()
         {
-            switch (action.ActionMethod)
+            var newControlPoints = new List<Vector2>();
+
+            foreach (var piece in Pieces)
             {
-                case PlatformActionMethod.Delete:
+                if (!piece.IsSelected.Value)
-                    var newControlPoints = new List<Vector2>();
+                    newControlPoints.Add(slider.Path.ControlPoints[piece.Index]);
-
-                    foreach (var piece in Pieces)
-                    {
-                        if (!piece.IsSelected.Value)
-                            newControlPoints.Add(slider.Path.ControlPoints[piece.Index]);
-                    }
-
-                    // Ensure that there are any points to be deleted
-                    if (newControlPoints.Count == slider.Path.ControlPoints.Length)
-                        return false;
-
-                    // If there are 0 remaining control points, treat the slider as being deleted
-                    if (newControlPoints.Count == 0)
-                    {
-                        placementHandler?.Delete(slider);
-                        return true;
-                    }
-
-                    // Make control points relative
-                    Vector2 first = newControlPoints[0];
-                    for (int i = 0; i < newControlPoints.Count; i++)
-                        newControlPoints[i] = newControlPoints[i] - first;
-
-                    // The slider's position defines the position of the first control point, and all further control points are relative to that point
-                    slider.Position = slider.Position + first;
-
-                    // Since pieces are re-used, they will not point to the deleted control points while remaining selected
-                    foreach (var piece in Pieces)
-                        piece.IsSelected.Value = false;
-
-                    ControlPointsChanged?.Invoke(newControlPoints.ToArray());
-
-                    return true;
             }
 
-            return false;
+            // Ensure that there are any points to be deleted
+            if (newControlPoints.Count == slider.Path.ControlPoints.Length)
+                return false;
+
+            // If there are 0 remaining control points, treat the slider as being deleted
+            if (newControlPoints.Count == 0)
+            {
+                placementHandler?.Delete(slider);
+                return true;
+            }
+
+            // Make control points relative
+            Vector2 first = newControlPoints[0];
+            for (int i = 0; i < newControlPoints.Count; i++)
+                newControlPoints[i] = newControlPoints[i] - first;
+
+            // The slider's position defines the position of the first control point, and all further control points are relative to that point
+            slider.Position = slider.Position + first;
+
+            // Since pieces are re-used, they will not point to the deleted control points while remaining selected
+            foreach (var piece in Pieces)
+                piece.IsSelected.Value = false;
+
+            ControlPointsChanged?.Invoke(newControlPoints.ToArray());
+            return true;
         }
 
-        public bool OnReleased(PlatformAction action) => action.ActionMethod == PlatformActionMethod.Delete;
+        public MenuItem[] ContextMenuItems
+        {
+            get
+            {
+                if (!Pieces.Any(p => p.IsHovered))
+                    return null;
+
+                int selectedPoints = Pieces.Count(p => p.IsSelected.Value);
+
+                if (selectedPoints == 0)
+                    return null;
+
+                return new MenuItem[]
+                {
+                    new OsuMenuItem($"Delete {"control point".ToQuantity(selectedPoints)}", MenuItemType.Destructive, () => deleteSelected())
+                };
+            }
+        }
     }
 }

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

@@ -1,6 +1,7 @@
 // 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 osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -13,7 +14,6 @@ using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 using osu.Game.Scoring;
-using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Mods
@@ -120,7 +120,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                 };
             }
 
-            private float calculateGap(float value) => MathHelper.Clamp(value, 0, target_clamp) * targetBreakMultiplier;
+            private float calculateGap(float value) => Math.Clamp(value, 0, target_clamp) * targetBreakMultiplier;
 
             // lagrange polinominal for (0,0) (0.6,0.4) (1,1) should make a good curve
             private static float applyAdjustmentCurve(float value) => 0.6f * value * value + 0.4f * value;

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

@@ -1,6 +1,7 @@
 // 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 osu.Framework.Bindables;
@@ -55,7 +56,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                 var destination = e.MousePosition;
 
                 FlashlightPosition = Interpolation.ValueAt(
-                    MathHelper.Clamp(Clock.ElapsedFrameTime, 0, follow_delay), position, destination, 0, follow_delay, Easing.Out);
+                    Math.Clamp(Clock.ElapsedFrameTime, 0, follow_delay), position, destination, 0, follow_delay, Easing.Out);
 
                 return base.OnMouseMove(e);
             }

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

@@ -132,7 +132,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             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);
+                Rotation = Interpolation.ValueAt(Math.Clamp(Clock.ElapsedFrameTime, 0, 100), Rotation, aimRotation, 0, 50, Easing.OutQuint);
             }
         }
     }

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

@@ -1,6 +1,7 @@
 // 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 osuTK;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
@@ -165,7 +166,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             Tracking.Value = Ball.Tracking;
 
-            double completionProgress = MathHelper.Clamp((Time.Current - slider.StartTime) / slider.Duration, 0, 1);
+            double completionProgress = Math.Clamp((Time.Current - slider.StartTime) / slider.Duration, 0, 1);
 
             Ball.UpdateProgress(completionProgress);
             Body.UpdateProgress(completionProgress);

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

@@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             base.Update();
 
-            double completionProgress = MathHelper.Clamp((Time.Current - slider.StartTime) / slider.Duration, 0, 1);
+            double completionProgress = Math.Clamp((Time.Current - slider.StartTime) / slider.Duration, 0, 1);
 
             //todo: we probably want to reconsider this before adding scoring, but it looks and feels nice.
             if (!IsHit)

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

@@ -1,6 +1,7 @@
 // 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.Linq;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -136,7 +137,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             positionBindable.BindTo(HitObject.PositionBindable);
         }
 
-        public float Progress => MathHelper.Clamp(Disc.RotationAbsolute / 360 / Spinner.SpinsRequired, 0, 1);
+        public float Progress => Math.Clamp(Disc.RotationAbsolute / 360 / Spinner.SpinsRequired, 0, 1);
 
         protected override void CheckForResult(bool userTriggered, double timeOffset)
         {

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

@@ -69,7 +69,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
             var spanProgress = slider.ProgressAt(completionProgress);
 
             double start = 0;
-            double end = SnakingIn.Value ? MathHelper.Clamp((Time.Current - (slider.StartTime - slider.TimePreempt)) / (slider.TimePreempt / 3), 0, 1) : 1;
+            double end = SnakingIn.Value ? Math.Clamp((Time.Current - (slider.StartTime - slider.TimePreempt)) / (slider.TimePreempt / 3), 0, 1) : 1;
 
             if (span >= slider.SpanCount() - 1)
             {

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

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup Label="Project">
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <OutputType>Library</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Description>click the circles. to the beat.</Description>

osu.Game.Rulesets.Taiko.Tests.Android/Properties/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="osu.Game.Rulesets.Taiko.Tests.Android" android:installLocation="auto">
-	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
+	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29" />
 	<application android:allowBackup="true" android:supportsRtl="true" android:label="osu!taiko Test" />
 </manifest>

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

@@ -1,12 +1,12 @@
 // 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.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.MathUtils;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
-using osuTK;
 using osuTK.Graphics;
 using osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces;
 using osu.Framework.Graphics;
@@ -98,7 +98,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
             else
                 rollingHits--;
 
-            rollingHits = MathHelper.Clamp(rollingHits, 0, rolling_hits_for_engaged_colour);
+            rollingHits = Math.Clamp(rollingHits, 0, rolling_hits_for_engaged_colour);
 
             Color4 newColour = Interpolation.ValueAt((float)rollingHits / rolling_hits_for_engaged_colour, colourIdle, colourEngaged, 0, 1);
             MainPiece.FadeAccent(newColour, 100);

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

@@ -10,7 +10,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces;
-using osuTK;
 using osuTK.Graphics;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Rulesets.Objects;
@@ -179,7 +178,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
                 var completion = (float)numHits / HitObject.RequiredHits;
 
                 expandingRing
-                    .FadeTo(expandingRing.Alpha + MathHelper.Clamp(completion / 16, 0.1f, 0.6f), 50)
+                    .FadeTo(expandingRing.Alpha + Math.Clamp(completion / 16, 0.1f, 0.6f), 50)
                     .Then()
                     .FadeTo(completion / 8, 2000, Easing.OutQuint);
 

osu.Game.Rulesets.Taiko/UI/TaikoPlayfieldAdjustmentContainer.cs

@@ -1,6 +1,7 @@
 // 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 osu.Framework.Graphics;
 using osu.Game.Rulesets.UI;
 using osuTK;
@@ -22,7 +23,7 @@ namespace osu.Game.Rulesets.Taiko.UI
         {
             base.Update();
 
-            float aspectAdjust = MathHelper.Clamp(Parent.ChildSize.X / Parent.ChildSize.Y, 0.4f, 4) / default_aspect;
+            float aspectAdjust = Math.Clamp(Parent.ChildSize.X / Parent.ChildSize.Y, 0.4f, 4) / default_aspect;
             Size = new Vector2(1, default_relative_height * aspectAdjust);
         }
     }

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

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup Label="Project">
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <OutputType>Library</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Description>bash the drum. to the beat.</Description>

osu.Game.Tests.Android/Properties/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="osu.Game.Tests.Android" android:installLocation="auto">
-	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
+	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29" />
 	<application android:allowBackup="true" android:supportsRtl="true" android:label="osu!visual Test" />
 </manifest>

osu.Game.Tests/Visual/Components/TestScenePreviewTrackManager.cs

@@ -3,6 +3,7 @@
 
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
 using osu.Framework.Audio.Track;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Audio;
@@ -13,7 +14,9 @@ namespace osu.Game.Tests.Visual.Components
 {
     public class TestScenePreviewTrackManager : OsuTestScene, IPreviewTrackOwner
     {
-        private readonly PreviewTrackManager trackManager = new TestPreviewTrackManager();
+        private readonly TestPreviewTrackManager trackManager = new TestPreviewTrackManager();
+
+        private AudioManager audio;
 
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
         {
@@ -24,8 +27,10 @@ namespace osu.Game.Tests.Visual.Components
         }
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(AudioManager audio)
         {
+            this.audio = audio;
+
             Add(trackManager);
         }
 
@@ -108,6 +113,60 @@ namespace osu.Game.Tests.Visual.Components
             AddAssert("track stopped", () => !track.IsRunning);
         }
 
+        /// <summary>
+        /// Ensures that <see cref="PreviewTrackManager.CurrentTrack"/> changes correctly.
+        /// </summary>
+        [Test]
+        public void TestCurrentTrackChanges()
+        {
+            PreviewTrack track = null;
+            TestTrackOwner owner = null;
+
+            AddStep("get track", () => Add(owner = new TestTrackOwner(track = getTrack())));
+            AddUntilStep("wait loaded", () => track.IsLoaded);
+            AddStep("start track", () => track.Start());
+            AddAssert("current is track", () => trackManager.CurrentTrack == track);
+            AddStep("pause manager updates", () => trackManager.AllowUpdate = false);
+            AddStep("stop any playing", () => trackManager.StopAnyPlaying(owner));
+            AddAssert("current not changed", () => trackManager.CurrentTrack == track);
+            AddStep("resume manager updates", () => trackManager.AllowUpdate = true);
+            AddAssert("current is null", () => trackManager.CurrentTrack == null);
+        }
+
+        /// <summary>
+        /// Ensures that <see cref="PreviewTrackManager"/> mutes game-wide audio tracks correctly.
+        /// </summary>
+        [TestCase(false)]
+        [TestCase(true)]
+        public void TestEnsureMutingCorrectly(bool stopAnyPlaying)
+        {
+            PreviewTrack track = null;
+            TestTrackOwner owner = null;
+
+            AddStep("ensure volume not zero", () =>
+            {
+                if (audio.Volume.Value == 0)
+                    audio.Volume.Value = 1;
+
+                if (audio.VolumeTrack.Value == 0)
+                    audio.VolumeTrack.Value = 1;
+            });
+
+            AddAssert("game not muted", () => audio.Tracks.AggregateVolume.Value != 0);
+
+            AddStep("get track", () => Add(owner = new TestTrackOwner(track = getTrack())));
+            AddUntilStep("wait loaded", () => track.IsLoaded);
+            AddStep("start track", () => track.Start());
+            AddAssert("game is muted", () => audio.Tracks.AggregateVolume.Value == 0);
+
+            if (stopAnyPlaying)
+                AddStep("stop any playing", () => trackManager.StopAnyPlaying(owner));
+            else
+                AddStep("stop track", () => track.Stop());
+
+            AddAssert("game not muted", () => audio.Tracks.AggregateVolume.Value != 0);
+        }
+
         private TestPreviewTrack getTrack() => (TestPreviewTrack)trackManager.Get(null);
 
         private TestPreviewTrack getOwnedTrack()
@@ -144,8 +203,20 @@ namespace osu.Game.Tests.Visual.Components
 
         public class TestPreviewTrackManager : PreviewTrackManager
         {
+            public bool AllowUpdate = true;
+
+            public new PreviewTrack CurrentTrack => base.CurrentTrack;
+
             protected override TrackManagerPreviewTrack CreatePreviewTrack(BeatmapSetInfo beatmapSetInfo, ITrackStore trackStore) => new TestPreviewTrack(beatmapSetInfo, trackStore);
 
+            public override bool UpdateSubTree()
+            {
+                if (!AllowUpdate)
+                    return true;
+
+                return base.UpdateSubTree();
+            }
+
             public class TestPreviewTrack : TrackManagerPreviewTrack
             {
                 private readonly ITrackStore trackManager;

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

@@ -12,6 +12,8 @@ using osu.Game.Rulesets.Catch;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Extensions.IEnumerableExtensions;
+using osu.Framework.Bindables;
+using osu.Game.Rulesets;
 
 namespace osu.Game.Tests.Visual.Online
 {
@@ -26,6 +28,7 @@ namespace osu.Game.Tests.Visual.Online
         {
             LeaderboardModSelector modSelector;
             FillFlowContainer<SpriteText> selectedMods;
+            var ruleset = new Bindable<RulesetInfo>();
 
             Add(selectedMods = new FillFlowContainer<SpriteText>
             {
@@ -37,6 +40,7 @@ namespace osu.Game.Tests.Visual.Online
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
+                Ruleset = { BindTarget = ruleset }
             });
 
             modSelector.SelectedMods.ItemsAdded += mods =>
@@ -62,12 +66,12 @@ namespace osu.Game.Tests.Visual.Online
                 });
             };
 
-            AddStep("osu ruleset", () => modSelector.Ruleset = new OsuRuleset().RulesetInfo);
+            AddStep("osu ruleset", () => ruleset.Value = new OsuRuleset().RulesetInfo);
-            AddStep("mania ruleset", () => modSelector.Ruleset = new ManiaRuleset().RulesetInfo);
+            AddStep("mania ruleset", () => ruleset.Value = new ManiaRuleset().RulesetInfo);
-            AddStep("taiko ruleset", () => modSelector.Ruleset = new TaikoRuleset().RulesetInfo);
+            AddStep("taiko ruleset", () => ruleset.Value = new TaikoRuleset().RulesetInfo);
-            AddStep("catch ruleset", () => modSelector.Ruleset = new CatchRuleset().RulesetInfo);
+            AddStep("catch ruleset", () => ruleset.Value = new CatchRuleset().RulesetInfo);
             AddStep("Deselect all", () => modSelector.DeselectAll());
-            AddStep("null ruleset", () => modSelector.Ruleset = null);
+            AddStep("null ruleset", () => ruleset.Value = null);
         }
     }
 }

osu.Game.Tests/Visual/Online/TestSceneNewsOverlay.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 osu.Game.Overlays;
+
+namespace osu.Game.Tests.Visual.Online
+{
+    public class TestSceneNewsOverlay : OsuTestScene
+    {
+        private NewsOverlay news;
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            Add(news = new NewsOverlay());
+            AddStep(@"Show", news.Show);
+            AddStep(@"Hide", news.Hide);
+
+            AddStep(@"Show front page", () => news.ShowFrontPage());
+            AddStep(@"Custom article", () => news.Current.Value = "Test Article 101");
+        }
+    }
+}

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

@@ -0,0 +1,36 @@
+// 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 osu.Framework.Graphics;
+using osu.Framework.Bindables;
+using osu.Game.Overlays.Comments;
+using osu.Framework.MathUtils;
+
+namespace osu.Game.Tests.Visual.Online
+{
+    public class TestSceneTotalCommentsCounter : OsuTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(TotalCommentsCounter),
+        };
+
+        public TestSceneTotalCommentsCounter()
+        {
+            var count = new BindableInt();
+
+            Add(new TotalCommentsCounter
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Current = { BindTarget = count }
+            });
+
+            AddStep(@"Set 100", () => count.Value = 100);
+            AddStep(@"Set 0", () => count.Value = 0);
+            AddStep(@"Set random", () => count.Value = RNG.Next(0, int.MaxValue));
+        }
+    }
+}

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

@@ -57,23 +57,6 @@ namespace osu.Game.Tests.Visual.SongSelect
             typeof(DrawableCarouselBeatmapSet),
         };
 
-        private class TestSongSelect : PlaySongSelect
-        {
-            public Action StartRequested;
-
-            public new Bindable<RulesetInfo> Ruleset => base.Ruleset;
-
-            public WorkingBeatmap CurrentBeatmap => Beatmap.Value;
-            public WorkingBeatmap CurrentBeatmapDetailsBeatmap => BeatmapDetails.Beatmap;
-            public new BeatmapCarousel Carousel => base.Carousel;
-
-            protected override bool OnStart()
-            {
-                StartRequested?.Invoke();
-                return base.OnStart();
-            }
-        }
-
         private TestSongSelect songSelect;
 
         [BackgroundDependencyLoader]
@@ -101,6 +84,17 @@ namespace osu.Game.Tests.Visual.SongSelect
             manager?.Delete(manager.GetAllUsableBeatmapSets());
         });
 
+        [Test]
+        public void TestSingleFilterOnEnter()
+        {
+            addRulesetImportStep(0);
+            addRulesetImportStep(0);
+
+            createSongSelect();
+
+            AddAssert("filter count is 1", () => songSelect.FilterCount == 1);
+        }
+
         [Test]
         public void TestAudioResuming()
         {
@@ -242,6 +236,22 @@ namespace osu.Game.Tests.Visual.SongSelect
             void onRulesetChange(ValueChangedEvent<RulesetInfo> e) => rulesetChangeIndex = actionIndex++;
         }
 
+        [Test]
+        public void TestModsRetainedBetweenSongSelect()
+        {
+            AddAssert("empty mods", () => !Mods.Value.Any());
+
+            createSongSelect();
+
+            addRulesetImportStep(0);
+
+            changeMods(new OsuModHardRock());
+
+            createSongSelect();
+
+            AddAssert("mods retained", () => Mods.Value.Any());
+        }
+
         [Test]
         public void TestStartAfterUnMatchingFilterDoesNotStart()
         {
@@ -357,5 +367,30 @@ namespace osu.Game.Tests.Visual.SongSelect
             base.Dispose(isDisposing);
             rulesets?.Dispose();
         }
+
+        private class TestSongSelect : PlaySongSelect
+        {
+            public Action StartRequested;
+
+            public new Bindable<RulesetInfo> Ruleset => base.Ruleset;
+
+            public WorkingBeatmap CurrentBeatmap => Beatmap.Value;
+            public WorkingBeatmap CurrentBeatmapDetailsBeatmap => BeatmapDetails.Beatmap;
+            public new BeatmapCarousel Carousel => base.Carousel;
+
+            protected override bool OnStart()
+            {
+                StartRequested?.Invoke();
+                return base.OnStart();
+            }
+
+            public int FilterCount;
+
+            protected override void ApplyFilterToCarousel(FilterCriteria criteria)
+            {
+                FilterCount++;
+                base.ApplyFilterToCarousel(criteria);
+            }
+        }
     }
 }

osu.Game.Tests/Visual/TestSceneOsuGame.cs

@@ -42,7 +42,7 @@ namespace osu.Game.Tests.Visual
         private IReadOnlyList<Type> requiredGameDependencies => new[]
         {
             typeof(OsuGame),
-            typeof(RavenLogger),
+            typeof(SentryLogger),
             typeof(OsuLogo),
             typeof(IdleTracker),
             typeof(OnScreenDisplay),

osu.Game.Tournament/Screens/Ladder/LadderDragContainer.cs

@@ -1,6 +1,7 @@
 // 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 osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
@@ -32,7 +33,7 @@ namespace osu.Game.Tournament.Screens.Ladder
 
         protected override bool OnScroll(ScrollEvent e)
         {
-            var newScale = MathHelper.Clamp(scale + e.ScrollDelta.Y / 15 * scale, min_scale, max_scale);
+            var newScale = Math.Clamp(scale + e.ScrollDelta.Y / 15 * scale, min_scale, max_scale);
 
             this.MoveTo(target = target - e.MousePosition * (newScale - scale), 2000, Easing.OutQuint);
             this.ScaleTo(scale = newScale, 2000, Easing.OutQuint);

osu.Game.Tournament/osu.Game.Tournament.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup Label="Project">
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <OutputType>Library</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Description>tools for tournaments.</Description>

osu.Game/Audio/PreviewTrackManager.cs

@@ -22,7 +22,7 @@ namespace osu.Game.Audio
         private AudioManager audio;
         private PreviewTrackStore trackStore;
 
-        private TrackManagerPreviewTrack current;
+        protected TrackManagerPreviewTrack CurrentTrack;
 
         [BackgroundDependencyLoader]
         private void load(AudioManager audio)
@@ -48,17 +48,17 @@ namespace osu.Game.Audio
 
             track.Started += () => Schedule(() =>
             {
-                current?.Stop();
+                CurrentTrack?.Stop();
-                current = track;
+                CurrentTrack = track;
                 audio.Tracks.AddAdjustment(AdjustableProperty.Volume, muteBindable);
             });
 
             track.Stopped += () => Schedule(() =>
             {
-                if (current != track)
+                if (CurrentTrack != track)
                     return;
 
-                current = null;
+                CurrentTrack = null;
                 audio.Tracks.RemoveAdjustment(AdjustableProperty.Volume, muteBindable);
             });
 
@@ -76,11 +76,11 @@ namespace osu.Game.Audio
         /// <param name="source">The <see cref="IPreviewTrackOwner"/> which may be the owner of the <see cref="PreviewTrack"/>.</param>
         public void StopAnyPlaying(IPreviewTrackOwner source)
         {
-            if (current == null || current.Owner != source)
+            if (CurrentTrack == null || CurrentTrack.Owner != source)
                 return;
 
-            current.Stop();
+            CurrentTrack.Stop();
-            current = null;
+            // CurrentTrack should not be set to null here as it will result in incorrect handling in the track.Stopped callback above.
         }
 
         /// <summary>

osu.Game/Beatmaps/BeatmapDifficulty.cs

@@ -56,10 +56,22 @@ namespace osu.Game.Beatmaps
         /// Maps a difficulty value [0, 10] to a two-piece linear range of values.
         /// </summary>
         /// <param name="difficulty">The difficulty value to be mapped.</param>
-        /// <param name="range">The values that define the two linear ranges.</param>
+        /// <param name="range">The values that define the two linear ranges.
-        /// <param name="range.od0">Minimum of the resulting range which will be achieved by a difficulty value of 0.</param>
+        /// <list type="table">
-        /// <param name="range.od5">Midpoint of the resulting range which will be achieved by a difficulty value of 5.</param>
+        ///   <item>
-        /// <param name="range.od10">Maximum of the resulting range which will be achieved by a difficulty value of 10.</param>
+        ///     <term>od0</term>
+        ///     <description>Minimum of the resulting range which will be achieved by a difficulty value of 0.</description>
+        ///   </item>
+        ///   <item>
+        ///     <term>od5</term>
+        ///     <description>Midpoint of the resulting range which will be achieved by a difficulty value of 5.</description>
+        ///   </item>
+        ///   <item>
+        ///     <term>od10</term>
+        ///     <description>Maximum of the resulting range which will be achieved by a difficulty value of 10.</description>
+        ///   </item>
+        /// </list>
+        /// </param>
         /// <returns>Value to which the difficulty value maps in the specified range.</returns>
         public static double DifficultyRange(double difficulty, (double od0, double od5, double od10) range)
             => DifficultyRange(difficulty, range.od0, range.od5, range.od10);

osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs

@@ -218,7 +218,7 @@ namespace osu.Game.Beatmaps.ControlPoints
         }
 
         /// <summary>
-        /// Check whether <see cref="newPoint"/> should be added.
+        /// Check whether <paramref name="newPoint"/> should be added.
         /// </summary>
         /// <param name="time">The time to find the timing control point at.</param>
         /// <param name="newPoint">A point to be added.</param>

osu.Game/Beatmaps/Formats/Decoder.cs

@@ -93,7 +93,7 @@ namespace osu.Game.Beatmaps.Formats
         /// <summary>
         /// Registers a fallback decoder instantiation function.
         /// The fallback will be returned if the first non-empty line of the decoded stream does not match any known magic.
-        /// Calling this method will overwrite any existing global fallback registration for type <see cref="T"/> - use with caution.
+        /// Calling this method will overwrite any existing global fallback registration for type <typeparamref name="T"/> - use with caution.
         /// </summary>
         /// <typeparam name="T">Type of object being decoded.</typeparam>
         /// <param name="constructor">A function that constructs the fallback<see cref="Decoder"/>.</param>

osu.Game/Configuration/BackgroundSource.cs

@@ -0,0 +1,11 @@
+// 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.
+
+namespace osu.Game.Configuration
+{
+    public enum BackgroundSource
+    {
+        Skin,
+        Beatmap
+    }
+}

osu.Game/Configuration/OsuConfigManager.cs

@@ -117,6 +117,8 @@ namespace osu.Game.Configuration
             Set(OsuSetting.UIHoldActivationDelay, 200f, 0f, 500f, 50f);
 
             Set(OsuSetting.IntroSequence, IntroSequence.Triangles);
+
+            Set(OsuSetting.MenuBackgroundSource, BackgroundSource.Skin);
         }
 
         public OsuConfigManager(Storage storage)
@@ -186,6 +188,7 @@ namespace osu.Game.Configuration
         UIScale,
         IntroSequence,
         UIHoldActivationDelay,
-        HitLighting
+        HitLighting,
+        MenuBackgroundSource
     }
 }

osu.Game/Database/ArchiveModelManager.cs

@@ -54,13 +54,13 @@ namespace osu.Game.Database
         public Action<Notification> PostNotification { protected get; set; }
 
         /// <summary>
-        /// Fired when a new <see cref="TModel"/> becomes available in the database.
+        /// Fired when a new <typeparamref name="TModel"/> becomes available in the database.
         /// This is not guaranteed to run on the update thread.
         /// </summary>
         public event Action<TModel> ItemAdded;
 
         /// <summary>
-        /// Fired when a <see cref="TModel"/> is removed from the database.
+        /// Fired when a <typeparamref name="TModel"/> is removed from the database.
         /// This is not guaranteed to run on the update thread.
         /// </summary>
         public event Action<TModel> ItemRemoved;
@@ -95,7 +95,7 @@ namespace osu.Game.Database
         }
 
         /// <summary>
-        /// Import one or more <see cref="TModel"/> items from filesystem <paramref name="paths"/>.
+        /// Import one or more <typeparamref name="TModel"/> items from filesystem <paramref name="paths"/>.
         /// This will post notifications tracking progress.
         /// </summary>
         /// <param name="paths">One or more archive locations on disk.</param>
@@ -173,7 +173,7 @@ namespace osu.Game.Database
         }
 
         /// <summary>
-        /// Import one <see cref="TModel"/> from the filesystem and delete the file on success.
+        /// Import one <typeparamref name="TModel"/> from the filesystem and delete the file on success.
         /// </summary>
         /// <param name="path">The archive location on disk.</param>
         /// <param name="cancellationToken">An optional cancellation token.</param>
@@ -275,7 +275,7 @@ namespace osu.Game.Database
         }
 
         /// <summary>
-        /// Import an item from a <see cref="TModel"/>.
+        /// Import an item from a <typeparamref name="TModel"/>.
         /// </summary>
         /// <param name="item">The model to be imported.</param>
         /// <param name="archive">An optional archive to use for model population.</param>
@@ -589,7 +589,7 @@ namespace osu.Game.Database
         protected TModel CheckForExisting(TModel model) => model.Hash == null ? null : ModelStore.ConsumableItems.FirstOrDefault(b => b.Hash == model.Hash);
 
         /// <summary>
-        /// After an existing <see cref="TModel"/> is found during an import process, the default behaviour is to restore the existing
+        /// After an existing <typeparamref name="TModel"/> is found during an import process, the default behaviour is to restore the existing
         /// item and skip the import. This method allows changing that behaviour.
         /// </summary>
         /// <param name="existing">The existing model.</param>

osu.Game/Database/DownloadableArchiveModelManager.cs

@@ -41,17 +41,17 @@ namespace osu.Game.Database
         }
 
         /// <summary>
-        /// Creates the download request for this <see cref="TModel"/>.
+        /// Creates the download request for this <typeparamref name="TModel"/>.
         /// </summary>
-        /// <param name="model">The <see cref="TModel"/> to be downloaded.</param>
+        /// <param name="model">The <typeparamref name="TModel"/> to be downloaded.</param>
         /// <param name="minimiseDownloadSize">Whether this download should be optimised for slow connections. Generally means extras are not included in the download bundle.</param>
         /// <returns>The request object.</returns>
         protected abstract ArchiveDownloadRequest<TModel> CreateDownloadRequest(TModel model, bool minimiseDownloadSize);
 
         /// <summary>
-        /// Begin a download for the requested <see cref="TModel"/>.
+        /// Begin a download for the requested <typeparamref name="TModel"/>.
         /// </summary>
-        /// <param name="model">The <see cref="TModel"/> to be downloaded.</param>
+        /// <param name="model">The <typeparamref name="TModel"/> to be downloaded.</param>
         /// <param name="minimiseDownloadSize">Whether this download should be optimised for slow connections. Generally means extras are not included in the download bundle.</param>
         /// <returns>Whether the download was started.</returns>
         public bool Download(TModel model, bool minimiseDownloadSize = false)
@@ -131,9 +131,9 @@ namespace osu.Game.Database
         /// <summary>
         /// Performs implementation specific comparisons to determine whether a given model is present in the local store.
         /// </summary>
-        /// <param name="model">The <see cref="TModel"/> whose existence needs to be checked.</param>
+        /// <param name="model">The <typeparamref name="TModel"/> whose existence needs to be checked.</param>
         /// <param name="items">The usable items present in the store.</param>
-        /// <returns>Whether the <see cref="TModel"/> exists.</returns>
+        /// <returns>Whether the <typeparamref name="TModel"/> exists.</returns>
         protected abstract bool CheckLocalAvailability(TModel model, IQueryable<TModel> items);
 
         public ArchiveDownloadRequest<TModel> GetExistingDownload(TModel model) => currentDownloads.Find(r => r.Model.Equals(model));

osu.Game/Database/IModelDownloader.cs

@@ -14,34 +14,34 @@ namespace osu.Game.Database
         where TModel : class
     {
         /// <summary>
-        /// Fired when a <see cref="TModel"/> download begins.
+        /// Fired when a <typeparamref name="TModel"/> download begins.
         /// </summary>
         event Action<ArchiveDownloadRequest<TModel>> DownloadBegan;
 
         /// <summary>
-        /// Fired when a <see cref="TModel"/> download is interrupted, either due to user cancellation or failure.
+        /// Fired when a <typeparamref name="TModel"/> download is interrupted, either due to user cancellation or failure.
         /// </summary>
         event Action<ArchiveDownloadRequest<TModel>> DownloadFailed;
 
         /// <summary>
-        /// Checks whether a given <see cref="TModel"/> is already available in the local store.
+        /// Checks whether a given <typeparamref name="TModel"/> is already available in the local store.
         /// </summary>
-        /// <param name="model">The <see cref="TModel"/> whose existence needs to be checked.</param>
+        /// <param name="model">The <typeparamref name="TModel"/> whose existence needs to be checked.</param>
-        /// <returns>Whether the <see cref="TModel"/> exists.</returns>
+        /// <returns>Whether the <typeparamref name="TModel"/> exists.</returns>
         bool IsAvailableLocally(TModel model);
 
         /// <summary>
-        /// Begin a download for the requested <see cref="TModel"/>.
+        /// Begin a download for the requested <typeparamref name="TModel"/>.
         /// </summary>
-        /// <param name="model">The <see cref="TModel"/> to be downloaded.</param>
+        /// <param name="model">The <stypeparamref name="TModel"/> to be downloaded.</param>
         /// <param name="minimiseDownloadSize">Whether this download should be optimised for slow connections. Generally means extras are not included in the download bundle..</param>
         /// <returns>Whether the download was started.</returns>
         bool Download(TModel model, bool minimiseDownloadSize);
 
         /// <summary>
-        /// Gets an existing <see cref="TModel"/> download request if it exists.
+        /// Gets an existing <typeparamref name="TModel"/> download request if it exists.
         /// </summary>
-        /// <param name="model">The <see cref="TModel"/> whose request is wanted.</param>
+        /// <param name="model">The <typeparamref name="TModel"/> whose request is wanted.</param>
         /// <returns>The <see cref="ArchiveDownloadRequest{TModel}"/> object if it exists, otherwise null.</returns>
         ArchiveDownloadRequest<TModel> GetExistingDownload(TModel model);
     }

osu.Game/Database/IModelManager.cs

@@ -6,7 +6,7 @@ using System;
 namespace osu.Game.Database
 {
     /// <summary>
-    /// Represents a model manager that publishes events when <see cref="TModel"/>s are added or removed.
+    /// Represents a model manager that publishes events when <typeparamref name="TModel"/>s are added or removed.
     /// </summary>
     /// <typeparam name="TModel">The model type.</typeparam>
     public interface IModelManager<out TModel>

osu.Game/Database/MutableDatabaseBackedStore.cs

@@ -30,7 +30,7 @@ namespace osu.Game.Database
         public IQueryable<T> ConsumableItems => AddIncludesForConsumption(ContextFactory.Get().Set<T>());
 
         /// <summary>
-        /// Add a <see cref="T"/> to the database.
+        /// Add a <typeparamref name="T"/> to the database.
         /// </summary>
         /// <param name="item">The item to add.</param>
         public void Add(T item)
@@ -45,7 +45,7 @@ namespace osu.Game.Database
         }
 
         /// <summary>
-        /// Update a <see cref="T"/> in the database.
+        /// Update a <typeparamref name="T"/> in the database.
         /// </summary>
         /// <param name="item">The item to update.</param>
         public void Update(T item)
@@ -58,7 +58,7 @@ namespace osu.Game.Database
         }
 
         /// <summary>
-        /// Delete a <see cref="T"/> from the database.
+        /// Delete a <typeparamref name="T"/> from the database.
         /// </summary>
         /// <param name="item">The item to delete.</param>
         public bool Delete(T item)
@@ -77,7 +77,7 @@ namespace osu.Game.Database
         }
 
         /// <summary>
-        /// Restore a <see cref="T"/> from a deleted state.
+        /// Restore a <typeparamref name="T"/> from a deleted state.
         /// </summary>
         /// <param name="item">The item to undelete.</param>
         public bool Undelete(T item)

osu.Game/Graphics/Backgrounds/BeatmapBackground.cs

@@ -0,0 +1,28 @@
+// 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.Textures;
+using osu.Game.Beatmaps;
+
+namespace osu.Game.Graphics.Backgrounds
+{
+    public class BeatmapBackground : Background
+    {
+        public readonly WorkingBeatmap Beatmap;
+
+        private readonly string fallbackTextureName;
+
+        public BeatmapBackground(WorkingBeatmap beatmap, string fallbackTextureName = @"Backgrounds/bg1")
+        {
+            Beatmap = beatmap;
+            this.fallbackTextureName = fallbackTextureName;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(TextureStore textures)
+        {
+            Sprite.Texture = Beatmap?.Background ?? textures.Get(fallbackTextureName);
+        }
+    }
+}

osu.Game/Graphics/Containers/ParallaxContainer.cs

@@ -1,6 +1,7 @@
 // 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 osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics;
 using osu.Framework.Input;
@@ -48,7 +49,7 @@ namespace osu.Game.Graphics.Containers
                 if (!parallaxEnabled.Value)
                 {
                     content.MoveTo(Vector2.Zero, firstUpdate ? 0 : 1000, Easing.OutQuint);
-                    content.Scale = new Vector2(1 + System.Math.Abs(ParallaxAmount));
+                    content.Scale = new Vector2(1 + Math.Abs(ParallaxAmount));
                 }
             };
         }
@@ -71,10 +72,10 @@ namespace osu.Game.Graphics.Containers
 
                 const float parallax_duration = 100;
 
-                double elapsed = MathHelper.Clamp(Clock.ElapsedFrameTime, 0, parallax_duration);
+                double elapsed = Math.Clamp(Clock.ElapsedFrameTime, 0, parallax_duration);
 
                 content.Position = Interpolation.ValueAt(elapsed, content.Position, offset, 0, parallax_duration, Easing.OutQuint);
-                content.Scale = Interpolation.ValueAt(elapsed, content.Scale, new Vector2(1 + System.Math.Abs(ParallaxAmount)), 0, 1000, Easing.OutQuint);
+                content.Scale = Interpolation.ValueAt(elapsed, content.Scale, new Vector2(1 + Math.Abs(ParallaxAmount)), 0, 1000, Easing.OutQuint);
             }
 
             firstUpdate = false;

osu.Game/Graphics/Sprites/OsuSpriteText.cs

@@ -19,7 +19,7 @@ namespace osu.Game.Graphics.Sprites
     public static class OsuSpriteTextTransformExtensions
     {
         /// <summary>
-        /// Sets <see cref="OsuSpriteText.Text"/> to a new value after a duration.
+        /// Sets <see cref="SpriteText.Text">Text</see> to a new value after a duration.
         /// </summary>
         /// <returns>A <see cref="TransformSequence{T}"/> to which further transforms can be added.</returns>
         public static TransformSequence<T> TransformTextTo<T>(this T spriteText, string newText, double duration = 0, Easing easing = Easing.None)
@@ -27,7 +27,7 @@ namespace osu.Game.Graphics.Sprites
             => spriteText.TransformTo(nameof(OsuSpriteText.Text), newText, duration, easing);
 
         /// <summary>
-        /// Sets <see cref="OsuSpriteText.Text"/> to a new value after a duration.
+        /// Sets <see cref="SpriteText.Text">Text</see> to a new value after a duration.
         /// </summary>
         /// <returns>A <see cref="TransformSequence{T}"/> to which further transforms can be added.</returns>
         public static TransformSequence<T> TransformTextTo<T>(this TransformSequence<T> t, string newText, double duration = 0, Easing easing = Easing.None)

osu.Game/Graphics/UserInterface/Bar.cs

@@ -1,12 +1,12 @@
 // 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 osuTK;
 using osuTK.Graphics;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using System;
 
 namespace osu.Game.Graphics.UserInterface
 {
@@ -29,7 +29,7 @@ namespace osu.Game.Graphics.UserInterface
             get => length;
             set
             {
-                length = MathHelper.Clamp(value, 0, 1);
+                length = Math.Clamp(value, 0, 1);
                 updateBarLength();
             }
         }

osu.Game/Graphics/UserInterface/IconButton.cs

@@ -16,7 +16,7 @@ namespace osu.Game.Graphics.UserInterface
         private Color4? iconColour;
 
         /// <summary>
-        /// The icon colour. This does not affect <see cref="IconButton.Colour"/>.
+        /// The icon colour. This does not affect <see cref="Drawable.Colour">Colour</see>.
         /// </summary>
         public Color4 IconColour
         {
@@ -49,7 +49,7 @@ namespace osu.Game.Graphics.UserInterface
         }
 
         /// <summary>
-        /// The icon scale. This does not affect <see cref="IconButton.Scale"/>.
+        /// The icon scale. This does not affect <see cref="Drawable.Scale">Scale</see>.
         /// </summary>
         public Vector2 IconScale
         {

osu.Game/Graphics/UserInterface/OsuSliderBar.cs

@@ -175,9 +175,9 @@ namespace osu.Game.Graphics.UserInterface
         protected override void UpdateAfterChildren()
         {
             base.UpdateAfterChildren();
-            leftBox.Scale = new Vector2(MathHelper.Clamp(
+            leftBox.Scale = new Vector2(Math.Clamp(
                 Nub.DrawPosition.X - Nub.DrawWidth / 2, 0, DrawWidth), 1);
-            rightBox.Scale = new Vector2(MathHelper.Clamp(
+            rightBox.Scale = new Vector2(Math.Clamp(
                 DrawWidth - Nub.DrawPosition.X - Nub.DrawWidth / 2, 0, DrawWidth), 1);
         }
 

osu.Game/Graphics/UserInterface/OsuTabControl.cs

@@ -32,7 +32,7 @@ namespace osu.Game.Graphics.UserInterface
         protected virtual float StripHeight() => 1;
 
         /// <summary>
-        /// Whether entries should be automatically populated if <see cref="T"/> is an <see cref="Enum"/> type.
+        /// Whether entries should be automatically populated if <typeparamref name="T"/> is an <see cref="Enum"/> type.
         /// </summary>
         protected virtual bool AddEnumEntriesAutomatically => true;
 
@@ -99,7 +99,7 @@ namespace osu.Game.Graphics.UserInterface
 
             // dont bother calculating if the strip is invisible
             if (strip.Colour.MaxAlpha > 0)
-                strip.Width = Interpolation.ValueAt(MathHelper.Clamp(Clock.ElapsedFrameTime, 0, 1000), strip.Width, StripWidth(), 0, 500, Easing.OutQuint);
+                strip.Width = Interpolation.ValueAt(Math.Clamp(Clock.ElapsedFrameTime, 0, 1000), strip.Width, StripWidth(), 0, 500, Easing.OutQuint);
         }
 
         public class OsuTabItem : TabItem<T>, IHasAccentColour

osu.Game/Input/Bindings/DatabasedKeyBindingContainer.cs

@@ -30,7 +30,7 @@ namespace osu.Game.Input.Bindings
         /// </summary>
         /// <param name="ruleset">A reference to identify the current <see cref="Ruleset"/>. Used to lookup mappings. Null for global mappings.</param>
         /// <param name="variant">An optional variant for the specified <see cref="Ruleset"/>. Used when a ruleset has more than one possible keyboard layouts.</param>
-        /// <param name="simultaneousMode">Specify how to deal with multiple matches of <see cref="KeyCombination"/>s and <see cref="T"/>s.</param>
+        /// <param name="simultaneousMode">Specify how to deal with multiple matches of <see cref="KeyCombination"/>s and <typeparamref name="T"/>s.</param>
         public DatabasedKeyBindingContainer(RulesetInfo ruleset = null, int? variant = null, SimultaneousBindingMode simultaneousMode = SimultaneousBindingMode.None)
             : base(simultaneousMode)
         {

osu.Game/Online/API/APIAccess.cs

@@ -227,7 +227,7 @@ namespace osu.Game.Online.API
             {
                 try
                 {
-                    return JObject.Parse(req.ResponseString).SelectToken("form_error", true).ToObject<RegistrationRequest.RegistrationRequestErrors>();
+                    return JObject.Parse(req.GetResponseString()).SelectToken("form_error", true).ToObject<RegistrationRequest.RegistrationRequestErrors>();
                 }
                 catch
                 {

osu.Game/Online/API/APIRequest.cs

@@ -113,7 +113,7 @@ namespace osu.Game.Online.API
             cancelled = true;
             WebRequest?.Abort();
 
-            string responseString = WebRequest?.ResponseString;
+            string responseString = WebRequest?.GetResponseString();
 
             if (!string.IsNullOrEmpty(responseString))
             {

osu.Game/Online/DownloadTrackingComposite.cs

@@ -11,7 +11,7 @@ using osu.Game.Online.API;
 namespace osu.Game.Online
 {
     /// <summary>
-    /// A component which tracks a <see cref="TModel"/> through potential download/import/deletion.
+    /// A component which tracks a <typeparamref name="TModel"/> through potential download/import/deletion.
     /// </summary>
     public abstract class DownloadTrackingComposite<TModel, TModelManager> : CompositeDrawable
         where TModel : class, IEquatable<TModel>
@@ -22,7 +22,7 @@ namespace osu.Game.Online
         private TModelManager manager;
 
         /// <summary>
-        /// Holds the current download state of the <see cref="TModel"/>, whether is has already been downloaded, is in progress, or is not downloaded.
+        /// Holds the current download state of the <typeparamref name="TModel"/>, whether is has already been downloaded, is in progress, or is not downloaded.
         /// </summary>
         protected readonly Bindable<DownloadState> State = new Bindable<DownloadState>();
 

osu.Game/OsuGame.cs

@@ -71,7 +71,7 @@ namespace osu.Game
         [Cached]
         private readonly ScreenshotManager screenshotManager = new ScreenshotManager();
 
-        protected RavenLogger RavenLogger;
+        protected SentryLogger SentryLogger;
 
         public virtual Storage GetStorageForStableInstall() => null;
 
@@ -110,7 +110,7 @@ namespace osu.Game
 
             forwardLoggedErrorsToNotifications();
 
-            RavenLogger = new RavenLogger(this);
+            SentryLogger = new SentryLogger(this);
         }
 
         private void updateBlockingOverlayFade() =>
@@ -166,7 +166,7 @@ namespace osu.Game
 
             dependencies.CacheAs(this);
 
-            dependencies.Cache(RavenLogger);
+            dependencies.Cache(SentryLogger);
 
             dependencies.Cache(osuLogo = new OsuLogo { Alpha = 0 });
 
@@ -486,7 +486,7 @@ namespace osu.Game
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
-            RavenLogger.Dispose();
+            SentryLogger.Dispose();
         }
 
         protected override void LoadComplete()
@@ -925,6 +925,8 @@ namespace osu.Game
             {
                 OverlayActivationMode.Value = newOsuScreen.InitialOverlayActivationMode;
 
+                musicController.AllowRateAdjustments = newOsuScreen.AllowRateAdjustments;
+
                 if (newOsuScreen.HideOverlaysOnEnter)
                     CloseAllOverlays();
                 else

osu.Game/Overlays/BeatmapSet/LeaderboardModSelector.cs

@@ -20,34 +20,7 @@ namespace osu.Game.Overlays.BeatmapSet
     public class LeaderboardModSelector : CompositeDrawable
     {
         public readonly BindableList<Mod> SelectedMods = new BindableList<Mod>();
-
+        public readonly Bindable<RulesetInfo> Ruleset = new Bindable<RulesetInfo>();
-        private RulesetInfo ruleset;
-
-        public RulesetInfo Ruleset
-        {
-            get => ruleset;
-            set
-            {
-                if (ruleset?.Equals(value) ?? false)
-                {
-                    DeselectAll();
-                    return;
-                }
-
-                ruleset = value;
-
-                SelectedMods.Clear();
-                modsContainer.Clear();
-
-                if (ruleset == null)
-                    return;
-
-                modsContainer.Add(new ModButton(new ModNoMod()));
-                modsContainer.AddRange(ruleset.CreateInstance().GetAllMods().Where(m => m.Ranked).Select(m => new ModButton(m)));
-
-                modsContainer.ForEach(button => button.OnSelectionChanged = selectionChanged);
-            }
-        }
 
         private readonly FillFlowContainer<ModButton> modsContainer;
 
@@ -64,6 +37,38 @@ namespace osu.Game.Overlays.BeatmapSet
             };
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            Ruleset.BindValueChanged(onRulesetChanged, true);
+        }
+
+        private void onRulesetChanged(ValueChangedEvent<RulesetInfo> ruleset)
+        {
+            SelectedMods.Clear();
+            modsContainer.Clear();
+
+            if (ruleset.NewValue == null)
+                return;
+
+            modsContainer.Add(new ModButton(new ModNoMod()));
+            modsContainer.AddRange(ruleset.NewValue.CreateInstance().GetAllMods().Where(m => m.Ranked).Select(m => new ModButton(m)));
+
+            modsContainer.ForEach(button => button.OnSelectionChanged = selectionChanged);
+        }
+
+        protected override bool OnHover(HoverEvent e)
+        {
+            updateHighlighted();
+            return base.OnHover(e);
+        }
+
+        protected override void OnHoverLost(HoverLostEvent e)
+        {
+            base.OnHoverLost(e);
+            updateHighlighted();
+        }
+
         private void selectionChanged(Mod mod, bool selected)
         {
             if (selected)
@@ -71,43 +76,30 @@ namespace osu.Game.Overlays.BeatmapSet
             else
                 SelectedMods.Remove(mod);
 
-            if (!SelectedMods.Any() && !IsHovered)
+            updateHighlighted();
-                highlightAll();
         }
 
-        protected override bool OnHover(HoverEvent e)
+        private void updateHighlighted()
         {
-            if (!SelectedMods.Any())
+            if (SelectedMods.Any())
-                modsContainer.Children.Where(button => !button.IsHovered).ForEach(button => button.Highlighted.Value = false);
+                return;
 
-            return base.OnHover(e);
+            modsContainer.Children.Where(button => !button.IsHovered).ForEach(button => button.Highlighted.Value = !IsHovered);
-        }
-
-        protected override void OnHoverLost(HoverLostEvent e)
-        {
-            base.OnHoverLost(e);
-
-            if (!SelectedMods.Any())
-                highlightAll();
         }
 
         public void DeselectAll() => modsContainer.ForEach(mod => mod.Selected.Value = false);
 
-        private void highlightAll() => modsContainer.ForEach(mod => mod.Highlighted.Value = true);
-
         private class ModButton : ModIcon
         {
-            private const float mod_scale = 0.4f;
             private const int duration = 200;
 
-            public readonly BindableBool Selected = new BindableBool();
+            public readonly BindableBool Highlighted = new BindableBool();
             public Action<Mod, bool> OnSelectionChanged;
 
             public ModButton(Mod mod)
                 : base(mod)
             {
-                Scale = new Vector2(mod_scale);
+                Scale = new Vector2(0.4f);
-                Highlighted.Value = true;
                 Add(new HoverClickSounds());
             }
 
@@ -115,11 +107,19 @@ namespace osu.Game.Overlays.BeatmapSet
             {
                 base.LoadComplete();
 
+                Highlighted.BindValueChanged(highlighted =>
+                {
+                    if (Selected.Value)
+                        return;
+
+                    this.FadeColour(highlighted.NewValue ? Color4.White : Color4.DimGray, duration, Easing.OutQuint);
+                }, true);
+
                 Selected.BindValueChanged(selected =>
                 {
-                    updateState();
                     OnSelectionChanged?.Invoke(Mod, selected.NewValue);
-                });
+                    Highlighted.TriggerChange();
+                }, true);
             }
 
             protected override bool OnClick(ClickEvent e)
@@ -130,20 +130,15 @@ namespace osu.Game.Overlays.BeatmapSet
 
             protected override bool OnHover(HoverEvent e)
             {
-                updateState();
+                Highlighted.Value = true;
                 return false;
             }
 
             protected override void OnHoverLost(HoverLostEvent e)
             {
                 base.OnHoverLost(e);
-                updateState();
+                Highlighted.Value = false;
             }
-
-            private void updateState() => Highlighted.Value = IsHovered || Selected.Value;
-
-            protected override void OnHighlightedChanged(ValueChangedEvent<bool> highlighted) =>
-                this.FadeColour(highlighted.NewValue ? Color4.White : Color4.Gray, duration, Easing.OutQuint);
         }
     }
 }

osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs

@@ -107,7 +107,10 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                                 {
                                     Current = { BindTarget = scope }
                                 },
-                                modSelector = new LeaderboardModSelector()
+                                modSelector = new LeaderboardModSelector
+                                {
+                                    Ruleset = { BindTarget = ruleset }
+                                }
                             }
                         },
                         new Container
@@ -187,7 +190,13 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
 
         private void onBeatmapChanged(ValueChangedEvent<BeatmapInfo> beatmap)
         {
-            ruleset.Value = modSelector.Ruleset = beatmap.NewValue?.Ruleset;
+            var beatmapRuleset = beatmap.NewValue?.Ruleset;
+
+            if (ruleset.Value?.Equals(beatmapRuleset) ?? false)
+                modSelector.DeselectAll();
+            else
+                ruleset.Value = beatmapRuleset;
+
             scope.Value = BeatmapLeaderboardScope.Global;
         }
 

osu.Game/Overlays/Chat/Tabs/ChannelTabControl.cs

@@ -99,7 +99,7 @@ namespace osu.Game.Overlays.Chat.Tabs
         private void tabCloseRequested(TabItem<Channel> tab)
         {
             int totalTabs = TabContainer.Count - 1; // account for selectorTab
-            int currentIndex = MathHelper.Clamp(TabContainer.IndexOf(tab), 1, totalTabs);
+            int currentIndex = Math.Clamp(TabContainer.IndexOf(tab), 1, totalTabs);
 
             if (tab == SelectedTab && totalTabs > 1)
                 // Select the tab after tab-to-be-removed's index, or the tab before if current == last

osu.Game/Overlays/Comments/TotalCommentsCounter.cs

@@ -0,0 +1,80 @@
+// 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.Graphics.Containers;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics;
+using osu.Framework.Graphics.Sprites;
+using osuTK;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+
+namespace osu.Game.Overlays.Comments
+{
+    public class TotalCommentsCounter : CompositeDrawable
+    {
+        public readonly BindableInt Current = new BindableInt();
+
+        private readonly SpriteText counter;
+
+        public TotalCommentsCounter()
+        {
+            RelativeSizeAxes = Axes.X;
+            Height = 50;
+            AddInternal(new FillFlowContainer
+            {
+                Anchor = Anchor.CentreLeft,
+                Origin = Anchor.CentreLeft,
+                AutoSizeAxes = Axes.Both,
+                Direction = FillDirection.Horizontal,
+                Margin = new MarginPadding { Left = 50 },
+                Spacing = new Vector2(5, 0),
+                Children = new Drawable[]
+                {
+                    new SpriteText
+                    {
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                        Font = OsuFont.GetFont(size: 20, italics: true),
+                        Text = @"Comments"
+                    },
+                    new CircularContainer
+                    {
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                        AutoSizeAxes = Axes.Both,
+                        Masking = true,
+                        Children = new Drawable[]
+                        {
+                            new Box
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Colour = OsuColour.Gray(0.05f)
+                            },
+                            counter = new SpriteText
+                            {
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                Margin = new MarginPadding { Horizontal = 10, Vertical = 5 },
+                                Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold)
+                            }
+                        },
+                    }
+                }
+            });
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            counter.Colour = colours.BlueLighter;
+        }
+
+        protected override void LoadComplete()
+        {
+            Current.BindValueChanged(value => counter.Text = value.NewValue.ToString("N0"), true);
+            base.LoadComplete();
+        }
+    }
+}

osu.Game/Overlays/Dialog/PopupDialog.cs

@@ -241,7 +241,7 @@ namespace osu.Game.Overlays.Dialog
 
         protected override void PopOut()
         {
-            if (!actionInvoked)
+            if (!actionInvoked && content.IsPresent)
                 // In the case a user did not choose an action before a hide was triggered, press the last button.
                 // This is presumed to always be a sane default "cancel" action.
                 buttonsContainer.Last().Click();

osu.Game/Overlays/Mods/ModButton.cs

@@ -96,7 +96,7 @@ namespace osu.Game.Overlays.Mods
                 }
             }
 
-            foregroundIcon.Highlighted.Value = Selected;
+            foregroundIcon.Selected.Value = Selected;
 
             SelectionChanged?.Invoke(SelectedMod);
             return true;

osu.Game/Overlays/Music/PlaylistList.cs

@@ -217,7 +217,7 @@ namespace osu.Game.Overlays.Music
                         break;
                 }
 
-                dstIndex = MathHelper.Clamp(dstIndex, 0, items.Count - 1);
+                dstIndex = Math.Clamp(dstIndex, 0, items.Count - 1);
 
                 if (srcIndex == dstIndex)
                     return;

osu.Game/Overlays/MusicController.cs

@@ -233,6 +233,24 @@ namespace osu.Game.Overlays
             queuedDirection = null;
         }
 
+        private bool allowRateAdjustments;
+
+        /// <summary>
+        /// Whether mod rate adjustments are allowed to be applied.
+        /// </summary>
+        public bool AllowRateAdjustments
+        {
+            get => allowRateAdjustments;
+            set
+            {
+                if (allowRateAdjustments == value)
+                    return;
+
+                allowRateAdjustments = value;
+                ResetTrackAdjustments();
+            }
+        }
+
         public void ResetTrackAdjustments()
         {
             var track = current?.Track;
@@ -241,8 +259,11 @@ namespace osu.Game.Overlays
 
             track.ResetSpeedAdjustments();
 
-            foreach (var mod in mods.Value.OfType<IApplicableToClock>())
+            if (allowRateAdjustments)
-                mod.ApplyToClock(track);
+            {
+                foreach (var mod in mods.Value.OfType<IApplicableToClock>())
+                    mod.ApplyToClock(track);
+            }
         }
 
         protected override void Dispose(bool isDisposing)

osu.Game/Overlays/News/NewsContent.cs

@@ -0,0 +1,19 @@
+// 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.Graphics;
+using osu.Framework.Graphics.Containers;
+
+namespace osu.Game.Overlays.News
+{
+    public abstract class NewsContent : FillFlowContainer
+    {
+        protected NewsContent()
+        {
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+            Direction = FillDirection.Vertical;
+            Padding = new MarginPadding { Bottom = 100, Top = 20, Horizontal = 50 };
+        }
+    }
+}

osu.Game/Overlays/News/NewsHeader.cs

@@ -0,0 +1,109 @@
+// 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.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
+using osu.Game.Graphics;
+using osu.Game.Graphics.UserInterface;
+using System;
+
+namespace osu.Game.Overlays.News
+{
+    public class NewsHeader : OverlayHeader
+    {
+        private const string front_page_string = "Front Page";
+
+        private NewsHeaderTitle title;
+
+        public readonly Bindable<string> Current = new Bindable<string>(null);
+
+        public Action ShowFrontPage;
+
+        public NewsHeader()
+        {
+            TabControl.AddItem(front_page_string);
+
+            TabControl.Current.ValueChanged += e =>
+            {
+                if (e.NewValue == front_page_string)
+                    ShowFrontPage?.Invoke();
+            };
+
+            Current.ValueChanged += showArticle;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colour)
+        {
+            TabControl.AccentColour = colour.Violet;
+        }
+
+        private void showArticle(ValueChangedEvent<string> e)
+        {
+            if (e.OldValue != null)
+                TabControl.RemoveItem(e.OldValue);
+
+            if (e.NewValue != null)
+            {
+                TabControl.AddItem(e.NewValue);
+                TabControl.Current.Value = e.NewValue;
+
+                title.IsReadingArticle = true;
+            }
+            else
+            {
+                TabControl.Current.Value = front_page_string;
+                title.IsReadingArticle = false;
+            }
+        }
+
+        protected override Drawable CreateBackground() => new NewsHeaderBackground();
+
+        protected override Drawable CreateContent() => new Container();
+
+        protected override ScreenTitle CreateTitle() => title = new NewsHeaderTitle();
+
+        private class NewsHeaderBackground : Sprite
+        {
+            public NewsHeaderBackground()
+            {
+                RelativeSizeAxes = Axes.Both;
+                FillMode = FillMode.Fill;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(TextureStore textures)
+            {
+                Texture = textures.Get(@"Headers/news");
+            }
+        }
+
+        private class NewsHeaderTitle : ScreenTitle
+        {
+            private const string article_string = "Article";
+
+            public bool IsReadingArticle
+            {
+                set => Section = value ? article_string : front_page_string;
+            }
+
+            public NewsHeaderTitle()
+            {
+                Title = "News";
+                IsReadingArticle = false;
+            }
+
+            protected override Drawable CreateIcon() => new ScreenTitleTextureIcon(@"Icons/news");
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours)
+            {
+                AccentColour = colours.Violet;
+            }
+        }
+    }
+}

osu.Game/Overlays/NewsOverlay.cs

@@ -0,0 +1,68 @@
+// 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.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+using osu.Game.Overlays.News;
+
+namespace osu.Game.Overlays
+{
+    public class NewsOverlay : FullscreenOverlay
+    {
+        private NewsHeader header;
+
+        //ReSharper disable NotAccessedField.Local
+        private Container<NewsContent> content;
+
+        public readonly Bindable<string> Current = new Bindable<string>(null);
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            Children = new Drawable[]
+            {
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = colours.PurpleDarkAlternative
+                },
+                new OsuScrollContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Child = new FillFlowContainer
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Direction = FillDirection.Vertical,
+                        Children = new Drawable[]
+                        {
+                            header = new NewsHeader
+                            {
+                                ShowFrontPage = ShowFrontPage
+                            },
+                            content = new Container<NewsContent>
+                            {
+                                RelativeSizeAxes = Axes.X,
+                                AutoSizeAxes = Axes.Y,
+                            }
+                        },
+                    },
+                },
+            };
+
+            header.Current.BindTo(Current);
+            Current.TriggerChange();
+        }
+
+        public void ShowFrontPage()
+        {
+            Current.Value = null;
+            Show();
+        }
+    }
+}

osu.Game/Overlays/OnScreenDisplay.cs

@@ -86,7 +86,7 @@ namespace osu.Game.Overlays
         /// <param name="source">The object that registered the <see cref="ConfigManager{T}"/> to be tracked.</param>
         /// <param name="configManager">The <see cref="ConfigManager{T}"/> that is being tracked.</param>
         /// <exception cref="ArgumentNullException">If <paramref name="configManager"/> is null.</exception>
-        /// <exception cref="InvalidOperationException">If <paramref name="configManager"/> is not being tracked from the same <see cref="source"/>.</exception>
+        /// <exception cref="InvalidOperationException">If <paramref name="configManager"/> is not being tracked from the same <paramref name="source"/>.</exception>
         public void StopTracking(object source, ITrackableConfigManager configManager)
         {
             if (configManager == null) throw new ArgumentNullException(nameof(configManager));

osu.Game/Overlays/Profile/Header/Components/SupporterIcon.cs

@@ -1,6 +1,7 @@
 // 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 osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -8,7 +9,6 @@ using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
-using osuTK;
 
 namespace osu.Game.Overlays.Profile.Header.Components
 {
@@ -24,7 +24,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
         {
             set
             {
-                int count = MathHelper.Clamp(value, 0, 3);
+                int count = Math.Clamp(value, 0, 3);
 
                 if (count == 0)
                 {

osu.Game/Overlays/Settings/Sections/Audio/AudioDevicesSettings.cs

@@ -60,7 +60,10 @@ namespace osu.Game.Overlays.Settings.Sections.Audio
 
             Children = new Drawable[]
             {
-                dropdown = new AudioDeviceSettingsDropdown()
+                dropdown = new AudioDeviceSettingsDropdown
+                {
+                    Keywords = new[] { "speaker", "headphone", "output" }
+                }
             };
 
             updateItems();

osu.Game/Overlays/Settings/Sections/Audio/MainMenuSettings.cs

@@ -34,6 +34,12 @@ namespace osu.Game.Overlays.Settings.Sections.Audio
                     Bindable = config.GetBindable<IntroSequence>(OsuSetting.IntroSequence),
                     Items = Enum.GetValues(typeof(IntroSequence)).Cast<IntroSequence>()
                 },
+                new SettingsDropdown<BackgroundSource>
+                {
+                    LabelText = "Background source",
+                    Bindable = config.GetBindable<BackgroundSource>(OsuSetting.MenuBackgroundSource),
+                    Items = Enum.GetValues(typeof(BackgroundSource)).Cast<BackgroundSource>()
+                }
             };
         }
     }

osu.Game/Overlays/Settings/Sections/AudioSection.cs

@@ -1,6 +1,8 @@
 // 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.Collections.Generic;
+using System.Linq;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Overlays.Settings.Sections.Audio;
@@ -10,6 +12,9 @@ namespace osu.Game.Overlays.Settings.Sections
     public class AudioSection : SettingsSection
     {
         public override string Header => "Audio";
+
+        public override IEnumerable<string> FilterTerms => base.FilterTerms.Concat(new[] { "sound" });
+
         public override IconUsage Icon => FontAwesome.Solid.VolumeUp;
 
         public AudioSection()

osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs

@@ -38,6 +38,7 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
                 {
                     LabelText = "Show health display even when you can't fail",
                     Bindable = config.GetBindable<bool>(OsuSetting.ShowHealthDisplayWhenCantFail),
+                    Keywords = new[] { "hp", "bar" }
                 },
                 new SettingsCheckbox
                 {

osu.Game/Overlays/Settings/Sections/Gameplay/ModsSettings.cs

@@ -1,6 +1,8 @@
 // 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.Collections.Generic;
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Game.Configuration;
 
@@ -10,6 +12,8 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
     {
         protected override string Header => "Mods";
 
+        public override IEnumerable<string> FilterTerms => base.FilterTerms.Concat(new[] { "mod" });
+
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config)
         {
@@ -18,7 +22,7 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
                 new SettingsCheckbox
                 {
                     LabelText = "Increase visibility of first object when visual impairment mods are enabled",
-                    Bindable = config.GetBindable<bool>(OsuSetting.IncreaseFirstObjectVisibility)
+                    Bindable = config.GetBindable<bool>(OsuSetting.IncreaseFirstObjectVisibility),
                 },
             };
         }

osu.Game/Overlays/Settings/Sections/Gameplay/SongSelectSettings.cs

@@ -31,13 +31,15 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
                 {
                     LabelText = "Display beatmaps from",
                     Bindable = config.GetBindable<double>(OsuSetting.DisplayStarsMinimum),
-                    KeyboardStep = 0.1f
+                    KeyboardStep = 0.1f,
+                    Keywords = new[] { "star", "difficulty" }
                 },
                 new SettingsSlider<double, StarSlider>
                 {
                     LabelText = "up to",
                     Bindable = config.GetBindable<double>(OsuSetting.DisplayStarsMaximum),
-                    KeyboardStep = 0.1f
+                    KeyboardStep = 0.1f,
+                    Keywords = new[] { "star", "difficulty" }
                 },
                 new SettingsEnumDropdown<RandomSelectAlgorithm>
                 {

osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs

@@ -75,12 +75,14 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                     LabelText = "UI Scaling",
                     TransferValueOnCommit = true,
                     Bindable = osuConfig.GetBindable<float>(OsuSetting.UIScale),
-                    KeyboardStep = 0.01f
+                    KeyboardStep = 0.01f,
+                    Keywords = new[] { "scale", "letterbox" },
                 },
                 new SettingsEnumDropdown<ScalingMode>
                 {
                     LabelText = "Screen Scaling",
                     Bindable = osuConfig.GetBindable<ScalingMode>(OsuSetting.Scaling),
+                    Keywords = new[] { "scale", "letterbox" },
                 },
                 scalingSettings = new FillFlowContainer<SettingsSlider<float>>
                 {

osu.Game/Overlays/Settings/SettingsItem.cs

@@ -76,7 +76,9 @@ namespace osu.Game.Overlays.Settings
             }
         }
 
-        public virtual IEnumerable<string> FilterTerms => new[] { LabelText };
+        public virtual IEnumerable<string> FilterTerms => Keywords == null ? new[] { LabelText } : new List<string>(Keywords) { LabelText }.ToArray();
+
+        public IEnumerable<string> Keywords { get; set; }
 
         public bool MatchingFilter
         {

osu.Game/Overlays/Settings/SettingsSection.cs

@@ -24,7 +24,7 @@ namespace osu.Game.Overlays.Settings
         public abstract string Header { get; }
 
         public IEnumerable<IFilterable> FilterableChildren => Children.OfType<IFilterable>();
-        public IEnumerable<string> FilterTerms => new[] { Header };
+        public virtual IEnumerable<string> FilterTerms => new[] { Header };
 
         private const int header_size = 26;
         private const int header_margin = 25;

osu.Game/Overlays/Settings/SettingsSubsection.cs

@@ -21,7 +21,7 @@ namespace osu.Game.Overlays.Settings
         protected abstract string Header { get; }
 
         public IEnumerable<IFilterable> FilterableChildren => Children.OfType<IFilterable>();
-        public IEnumerable<string> FilterTerms => new[] { Header };
+        public virtual IEnumerable<string> FilterTerms => new[] { Header };
 
         public bool MatchingFilter
         {

osu.Game/Rulesets/Mods/ModTimeRamp.cs

@@ -9,7 +9,6 @@ using osu.Game.Beatmaps;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
-using osuTK;
 
 namespace osu.Game.Rulesets.Mods
 {
@@ -59,7 +58,7 @@ namespace osu.Game.Rulesets.Mods
         /// <param name="amount">The amount of adjustment to apply (from 0..1).</param>
         private void applyAdjustment(double amount)
         {
-            double adjust = 1 + (Math.Sign(FinalRateAdjustment) * MathHelper.Clamp(amount, 0, 1) * Math.Abs(FinalRateAdjustment));
+            double adjust = 1 + (Math.Sign(FinalRateAdjustment) * Math.Clamp(amount, 0, 1) * Math.Abs(FinalRateAdjustment));
 
             switch (clock)
             {

osu.Game/Rulesets/Objects/SliderEventGenerator.cs

@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using osuTK;
 
 namespace osu.Game.Rulesets.Objects
 {
@@ -18,7 +17,7 @@ namespace osu.Game.Rulesets.Objects
             const double max_length = 100000;
 
             var length = Math.Min(max_length, totalDistance);
-            tickDistance = MathHelper.Clamp(tickDistance, 0, length);
+            tickDistance = Math.Clamp(tickDistance, 0, length);
 
             var minDistanceFromEnd = velocity * 10;
 

osu.Game/Rulesets/Objects/SliderPath.cs

@@ -246,7 +246,7 @@ namespace osu.Game.Rulesets.Objects
 
         private double progressToDistance(double progress)
         {
-            return MathHelper.Clamp(progress, 0, 1) * Distance;
+            return Math.Clamp(progress, 0, 1) * Distance;
         }
 
         private Vector2 interpolateVertices(int i, double d)

osu.Game/Rulesets/Replays/FramedReplayInputHandler.cs

@@ -7,7 +7,6 @@ using JetBrains.Annotations;
 using osu.Framework.Input.StateChanges;
 using osu.Game.Input.Handlers;
 using osu.Game.Replays;
-using osuTK;
 
 namespace osu.Game.Rulesets.Replays
 {
@@ -52,7 +51,7 @@ namespace osu.Game.Rulesets.Replays
 
         private int? currentFrameIndex;
 
-        private int nextFrameIndex => currentFrameIndex.HasValue ? MathHelper.Clamp(currentFrameIndex.Value + (currentDirection > 0 ? 1 : -1), 0, Frames.Count - 1) : 0;
+        private int nextFrameIndex => currentFrameIndex.HasValue ? Math.Clamp(currentFrameIndex.Value + (currentDirection > 0 ? 1 : -1), 0, Frames.Count - 1) : 0;
 
         protected FramedReplayInputHandler(Replay replay)
         {

osu.Game/Rulesets/UI/DrawableRuleset.cs

@@ -246,9 +246,9 @@ namespace osu.Game.Rulesets.UI
         }
 
         /// <summary>
-        /// Creates and adds the visual representation of a <see cref="TObject"/> to this <see cref="DrawableRuleset{TObject}"/>.
+        /// Creates and adds the visual representation of a <typeparamref name="TObject"/> to this <see cref="DrawableRuleset{TObject}"/>.
         /// </summary>
-        /// <param name="hitObject">The <see cref="TObject"/> to add the visual representation for.</param>
+        /// <param name="hitObject">The <typeparamref name="TObject"/> to add the visual representation for.</param>
         private void addHitObject(TObject hitObject)
         {
             var drawableObject = CreateDrawableRepresentation(hitObject);
@@ -517,6 +517,12 @@ namespace osu.Game.Rulesets.UI
 
         public BindableDouble Frequency => throw new NotImplementedException();
 
+        public IBindable<double> AggregateVolume => throw new NotImplementedException();
+
+        public IBindable<double> AggregateBalance => throw new NotImplementedException();
+
+        public IBindable<double> AggregateFrequency => throw new NotImplementedException();
+
         public int PlaybackConcurrency
         {
             get => throw new NotImplementedException();

osu.Game/Rulesets/UI/ModIcon.cs

@@ -17,7 +17,7 @@ namespace osu.Game.Rulesets.UI
 {
     public class ModIcon : Container, IHasTooltip
     {
-        public readonly BindableBool Highlighted = new BindableBool();
+        public readonly BindableBool Selected = new BindableBool();
 
         private readonly SpriteIcon modIcon;
         private readonly SpriteIcon background;
@@ -114,12 +114,7 @@ namespace osu.Game.Rulesets.UI
         protected override void LoadComplete()
         {
             base.LoadComplete();
-            Highlighted.BindValueChanged(OnHighlightedChanged, true);
+            Selected.BindValueChanged(selected => background.Colour = selected.NewValue ? highlightedColour : backgroundColour, true);
-        }
-
-        protected virtual void OnHighlightedChanged(ValueChangedEvent<bool> highlighted)
-        {
-            background.Colour = highlighted.NewValue ? highlightedColour : backgroundColour;
         }
     }
 }

osu.Game/Rulesets/UI/Scrolling/Algorithms/IScrollAlgorithm.cs

@@ -13,7 +13,7 @@ namespace osu.Game.Rulesets.UI.Scrolling.Algorithms
         /// </remarks>
         /// <param name="time">The point in time.</param>
         /// <param name="timeRange">The amount of visible time.</param>
-        /// <returns>The time at which <paramref name="time"/> enters <see cref="timeRange"/>.</returns>
+        /// <returns>The time at which <paramref name="time"/> enters <paramref name="timeRange"/>.</returns>
         double GetDisplayStartTime(double time, double timeRange);
 
         /// <summary>
@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.UI.Scrolling.Algorithms
         /// <param name="startTime">The start time.</param>
         /// <param name="endTime">The end time.</param>
         /// <param name="timeRange">The amount of visible time.</param>
-        /// <param name="scrollLength">The absolute spatial length through <see cref="timeRange"/>.</param>
+        /// <param name="scrollLength">The absolute spatial length through <paramref name="timeRange"/>.</param>
         /// <returns>The absolute spatial length.</returns>
         float GetLength(double startTime, double endTime, double timeRange, float scrollLength);
 
@@ -32,7 +32,7 @@ namespace osu.Game.Rulesets.UI.Scrolling.Algorithms
         /// <param name="time">The time to compute the spatial position of.</param>
         /// <param name="currentTime">The current time.</param>
         /// <param name="timeRange">The amount of visible time.</param>
-        /// <param name="scrollLength">The absolute spatial length through <see cref="timeRange"/>.</param>
+        /// <param name="scrollLength">The absolute spatial length through <paramref name="timeRange"/>.</param>
         /// <returns>The absolute spatial position.</returns>
         float PositionAt(double time, double currentTime, double timeRange, float scrollLength);
 
@@ -42,7 +42,7 @@ namespace osu.Game.Rulesets.UI.Scrolling.Algorithms
         /// <param name="position">The absolute spatial position.</param>
         /// <param name="currentTime">The current time.</param>
         /// <param name="timeRange">The amount of visible time.</param>
-        /// <param name="scrollLength">The absolute spatial length through <see cref="timeRange"/>.</param>
+        /// <param name="scrollLength">The absolute spatial length through <paramref name="timeRange"/>.</param>
         /// <returns>The time at which <see cref="PositionAt(double,double,double,float)"/> == <paramref name="position"/>.</returns>
         double TimeAt(float position, double currentTime, double timeRange, float scrollLength);
 

osu.Game/Rulesets/UI/Scrolling/Algorithms/OverlappingScrollAlgorithm.cs

@@ -1,9 +1,9 @@
 // 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 osu.Framework.Lists;
 using osu.Game.Rulesets.Timing;
-using osuTK;
 
 namespace osu.Game.Rulesets.UI.Scrolling.Algorithms
 {
@@ -59,7 +59,7 @@ namespace osu.Game.Rulesets.UI.Scrolling.Algorithms
                 }
             }
 
-            i = MathHelper.Clamp(i, 0, controlPoints.Count - 1);
+            i = Math.Clamp(i, 0, controlPoints.Count - 1);
 
             return controlPoints[i].StartTime + (position - pos) * timeRange / controlPoints[i].Multiplier / scrollLength;
         }

osu.Game/Scoring/ScoreInfo.cs

@@ -183,6 +183,10 @@ namespace osu.Game.Scoring
 
         public override string ToString() => $"{User} playing {Beatmap}";
 
-        public bool Equals(ScoreInfo other) => other?.OnlineScoreID == OnlineScoreID;
+        public bool Equals(ScoreInfo other) =>
+            other != null
+            && other.OnlineScoreID == OnlineScoreID
+            && other.BeatmapInfoID == BeatmapInfoID
+            && other.Hash == Hash;
     }
 }

osu.Game/Scoring/ScoreManager.cs

@@ -69,6 +69,6 @@ namespace osu.Game.Scoring
 
         protected override ArchiveDownloadRequest<ScoreInfo> CreateDownloadRequest(ScoreInfo score, bool minimiseDownload) => new DownloadReplayRequest(score);
 
-        protected override bool CheckLocalAvailability(ScoreInfo model, IQueryable<ScoreInfo> items) => items.Any(s => s.OnlineScoreID == model.OnlineScoreID && s.Files.Any());
+        protected override bool CheckLocalAvailability(ScoreInfo model, IQueryable<ScoreInfo> items) => items.Any(s => s.Equals(model) && s.Files.Any());
     }
 }

osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs

@@ -6,7 +6,6 @@ using System.Threading;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Textures;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Graphics.Backgrounds;
@@ -107,22 +106,6 @@ namespace osu.Game.Screens.Backgrounds
             return base.Equals(other) && beatmap == otherBeatmapBackground.Beatmap;
         }
 
-        protected class BeatmapBackground : Background
-        {
-            public readonly WorkingBeatmap Beatmap;
-
-            public BeatmapBackground(WorkingBeatmap beatmap)
-            {
-                Beatmap = beatmap;
-            }
-
-            [BackgroundDependencyLoader]
-            private void load(TextureStore textures)
-            {
-                Sprite.Texture = Beatmap?.Background ?? textures.Get(@"Backgrounds/bg1");
-            }
-        }
-
         public class DimmableBackground : UserDimContainer
         {
             /// <summary>

osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs

@@ -6,6 +6,8 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.MathUtils;
 using osu.Framework.Threading;
+using osu.Game.Beatmaps;
+using osu.Game.Configuration;
 using osu.Game.Graphics.Backgrounds;
 using osu.Game.Online.API;
 using osu.Game.Skinning;
@@ -24,6 +26,10 @@ namespace osu.Game.Screens.Backgrounds
 
         private Bindable<User> user;
         private Bindable<Skin> skin;
+        private Bindable<BackgroundSource> mode;
+
+        [Resolved]
+        private IBindable<WorkingBeatmap> beatmap { get; set; }
 
         public BackgroundScreenDefault(bool animateOnEnter = true)
             : base(animateOnEnter)
@@ -31,13 +37,16 @@ namespace osu.Game.Screens.Backgrounds
         }
 
         [BackgroundDependencyLoader]
-        private void load(IAPIProvider api, SkinManager skinManager)
+        private void load(IAPIProvider api, SkinManager skinManager, OsuConfigManager config)
         {
             user = api.LocalUser.GetBoundCopy();
             skin = skinManager.CurrentSkin.GetBoundCopy();
+            mode = config.GetBindable<BackgroundSource>(OsuSetting.MenuBackgroundSource);
 
             user.ValueChanged += _ => Next();
             skin.ValueChanged += _ => Next();
+            mode.ValueChanged += _ => Next();
+            beatmap.ValueChanged += _ => Next();
 
             currentDisplay = RNG.Next(0, background_count);
 
@@ -66,7 +75,18 @@ namespace osu.Game.Screens.Backgrounds
             Background newBackground;
 
             if (user.Value?.IsSupporter ?? false)
-                newBackground = new SkinnedBackground(skin.Value, backgroundName);
+            {
+                switch (mode.Value)
+                {
+                    case BackgroundSource.Beatmap:
+                        newBackground = new BeatmapBackground(beatmap.Value, backgroundName);
+                        break;
+
+                    default:
+                        newBackground = new SkinnedBackground(skin.Value, backgroundName);
+                        break;
+                }
+            }
             else
                 newBackground = new Background(backgroundName);
 

osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/MarkerPart.cs

@@ -1,6 +1,7 @@
 // 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 osuTK;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -59,7 +60,7 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
                 if (Beatmap.Value == null)
                     return;
 
-                float markerPos = MathHelper.Clamp(ToLocalSpace(screenPosition).X, 0, DrawWidth);
+                float markerPos = Math.Clamp(ToLocalSpace(screenPosition).X, 0, DrawWidth);
                 adjustableClock.Seek(markerPos / DrawWidth * Beatmap.Value.Track.Length);
             });
         }

osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs

@@ -313,14 +313,15 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// Attempts to select any hovered blueprints.
         /// </summary>
         /// <param name="e">The input event that triggered this selection.</param>
-        private void beginClickSelection(UIEvent e)
+        private void beginClickSelection(MouseButtonEvent e)
         {
             Debug.Assert(!clickSelectionBegan);
 
-            // If a select blueprint is already hovered, disallow changes in selection.
+            // Deselections are only allowed for control + left clicks
-            // Exception is made when holding control, as deselection should still be allowed.
+            bool allowDeselection = e.ControlPressed && e.Button == MouseButton.Left;
-            if (!e.CurrentState.Keyboard.ControlPressed &&
+
-                selectionHandler.SelectedBlueprints.Any(s => s.IsHovered))
+            // Todo: This is probably incorrectly disallowing multiple selections on stacked objects
+            if (!allowDeselection && selectionHandler.SelectedBlueprints.Any(s => s.IsHovered))
                 return;
 
             foreach (SelectionBlueprint blueprint in selectionBlueprints.AliveBlueprints)

osu.Game/Screens/Edit/Compose/Components/CircularDistanceSnapGrid.cs

@@ -75,7 +75,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             float distance = direction.Length;
 
             float radius = DistanceSpacing;
-            int radialCount = MathHelper.Clamp((int)Math.Round(distance / radius), 1, MaxIntervals);
+            int radialCount = Math.Clamp((int)Math.Round(distance / radius), 1, MaxIntervals);
 
             Vector2 normalisedDirection = direction * new Vector2(1f / distance);
             Vector2 snappedPosition = CentrePosition + normalisedDirection * radialCount * radius;