Merge pull request #7555 from peppy/update-framework

Update framework

.gitignore

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

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

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

.idea/.idea.osu.Desktop/.idea/runConfigurations/osu_SDL.xml

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

.vscode/launch.json

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

.vscode/tasks.json

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

osu.Android.props

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

osu.Desktop.slnf

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

osu.Desktop/Program.cs

@@ -22,8 +22,9 @@ namespace osu.Desktop
         {
             // Back up the cwd before DesktopGameHost changes it
             var cwd = Environment.CurrentDirectory;
+            bool useSdl = args.Contains("--sdl");
 
-            using (DesktopGameHost host = Host.GetSuitableHost(@"osu", true))
+            using (DesktopGameHost host = Host.GetSuitableHost(@"osu", true, useSdl: useSdl))
             {
                 host.ExceptionThrown += handleException;
 

osu.Game.Benchmarks/BenchmarkBeatmapParsing.cs

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

osu.Game.Benchmarks/BenchmarkTest.cs

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

osu.Game.Benchmarks/Program.cs

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

osu.Game.Benchmarks/Properties/launchSettings.json

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

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

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

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

@@ -13,7 +13,7 @@ namespace osu.Game.Rulesets.Mania.Mods
     {
         public override string Name => "Fade In";
         public override string Acronym => "FI";
-        public override IconUsage Icon => OsuIcon.ModHidden;
+        public override IconUsage? Icon => OsuIcon.ModHidden;
         public override ModType Type => ModType.DifficultyIncrease;
         public override string Description => @"Keys appear out of nowhere!";
         public override double ScoreMultiplier => 1;

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

@@ -18,7 +18,7 @@ namespace osu.Game.Rulesets.Mania.Mods
         public override string Name => "Random";
         public override string Acronym => "RD";
         public override ModType Type => ModType.Conversion;
-        public override IconUsage Icon => OsuIcon.Dice;
+        public override IconUsage? Icon => OsuIcon.Dice;
         public override string Description => @"Shuffle around the keys!";
         public override double ScoreMultiplier => 1;
 

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

@@ -18,7 +18,7 @@ namespace osu.Game.Rulesets.Osu.Mods
     {
         public override string Name => "Autopilot";
         public override string Acronym => "AP";
-        public override IconUsage Icon => OsuIcon.ModAutopilot;
+        public override IconUsage? Icon => OsuIcon.ModAutopilot;
         public override ModType Type => ModType.Automation;
         public override string Description => @"Automatic cursor movement - just follow the rhythm.";
         public override double ScoreMultiplier => 1;

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

@@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         public override string Description => "Play with blinds on your screen.";
         public override string Acronym => "BL";
 
-        public override IconUsage Icon => FontAwesome.Solid.Adjust;
+        public override IconUsage? Icon => FontAwesome.Solid.Adjust;
         public override ModType Type => ModType.DifficultyIncrease;
 
         public override bool Ranked => false;

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

@@ -11,7 +11,7 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         public override string Acronym => "DF";
 
-        public override IconUsage Icon => FontAwesome.Solid.CompressArrowsAlt;
+        public override IconUsage? Icon => FontAwesome.Solid.CompressArrowsAlt;
 
         public override string Description => "Hit them at the right size!";
 

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

@@ -11,7 +11,7 @@ namespace osu.Game.Rulesets.Osu.Mods
 
         public override string Acronym => "GR";
 
-        public override IconUsage Icon => FontAwesome.Solid.ArrowsAltV;
+        public override IconUsage? Icon => FontAwesome.Solid.ArrowsAltV;
 
         public override string Description => "Hit them at the right size!";
 

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

@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Osu.Mods
     {
         public override string Name => "Spin In";
         public override string Acronym => "SI";
-        public override IconUsage Icon => FontAwesome.Solid.Undo;
+        public override IconUsage? Icon => FontAwesome.Solid.Undo;
         public override ModType Type => ModType.Fun;
         public override string Description => "Circles spin in. No approach circles.";
         public override double ScoreMultiplier => 1;

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

@@ -12,7 +12,7 @@ namespace osu.Game.Rulesets.Osu.Mods
     {
         public override string Name => "Spun Out";
         public override string Acronym => "SO";
-        public override IconUsage Icon => OsuIcon.ModSpunout;
+        public override IconUsage? Icon => OsuIcon.ModSpunout;
         public override ModType Type => ModType.DifficultyReduction;
         public override string Description => @"Spinners will be automatically completed.";
         public override double ScoreMultiplier => 0.9;

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

@@ -12,7 +12,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         public override string Name => "Target";
         public override string Acronym => "TP";
         public override ModType Type => ModType.Conversion;
-        public override IconUsage Icon => OsuIcon.ModTarget;
+        public override IconUsage? Icon => OsuIcon.ModTarget;
         public override string Description => @"Practice keeping up with the beat of the song.";
         public override double ScoreMultiplier => 1;
     }

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

@@ -6,7 +6,6 @@ using System.Linq;
 using osu.Framework.Bindables;
 using System.Collections.Generic;
 using osu.Framework.Extensions.Color4Extensions;
-using osu.Framework.Graphics.Sprites;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects.Drawables;
@@ -19,7 +18,6 @@ namespace osu.Game.Rulesets.Osu.Mods
     {
         public override string Name => "Traceable";
         public override string Acronym => "TC";
-        public override IconUsage Icon => FontAwesome.Brands.SnapchatGhost;
         public override ModType Type => ModType.Fun;
         public override string Description => "Put your faith in the approach circles...";
         public override double ScoreMultiplier => 1;

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

@@ -16,7 +16,7 @@ namespace osu.Game.Rulesets.Osu.Mods
     {
         public override string Name => "Transform";
         public override string Acronym => "TR";
-        public override IconUsage Icon => FontAwesome.Solid.ArrowsAlt;
+        public override IconUsage? Icon => FontAwesome.Solid.ArrowsAlt;
         public override ModType Type => ModType.Fun;
         public override string Description => "Everything rotates. EVERYTHING.";
         public override double ScoreMultiplier => 1;

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

@@ -17,7 +17,7 @@ namespace osu.Game.Rulesets.Osu.Mods
     {
         public override string Name => "Wiggle";
         public override string Acronym => "WG";
-        public override IconUsage Icon => FontAwesome.Solid.Certificate;
+        public override IconUsage? Icon => FontAwesome.Solid.Certificate;
         public override ModType Type => ModType.Fun;
         public override string Description => "They just won't stay still...";
         public override double ScoreMultiplier => 1;

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

@@ -6,13 +6,11 @@ using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Sprites;
 using osu.Framework.Utils;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables.Pieces;
 using osu.Game.Rulesets.Scoring;
 using osuTK;
-using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
@@ -23,7 +21,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         private double animDuration;
 
-        private readonly SkinnableDrawable scaleContainer;
+        private readonly Drawable scaleContainer;
 
         public DrawableRepeatPoint(RepeatPoint repeatPoint, DrawableSlider drawableSlider)
             : base(repeatPoint)
@@ -36,16 +34,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             Blending = BlendingParameters.Additive;
             Origin = Anchor.Centre;
 
-            InternalChild = scaleContainer = new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.ReverseArrow), _ => new SpriteIcon
-            {
-                RelativeSizeAxes = Axes.Both,
-                Icon = FontAwesome.Solid.ChevronRight,
-                Size = new Vector2(0.35f)
-            }, confineMode: ConfineMode.NoScaling)
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-            };
+            InternalChild = scaleContainer = new ReverseArrowPiece();
         }
 
         private readonly IBindable<float> scaleBindable = new Bindable<float>();
@@ -65,11 +54,11 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         protected override void UpdateInitialTransforms()
         {
-            animDuration = Math.Min(150, repeatPoint.SpanDuration / 2);
+            animDuration = Math.Min(300, repeatPoint.SpanDuration);
 
             this.Animate(
                 d => d.FadeIn(animDuration),
-                d => d.ScaleTo(0.5f).ScaleTo(1f, animDuration * 4, Easing.OutElasticHalf)
+                d => d.ScaleTo(0.5f).ScaleTo(1f, animDuration * 2, Easing.OutElasticHalf)
             );
         }
 
@@ -88,7 +77,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     break;
 
                 case ArmedState.Hit:
-                    this.FadeOut(animDuration, Easing.OutQuint)
+                    this.FadeOut(animDuration, Easing.Out)
                         .ScaleTo(Scale * 1.5f, animDuration, Easing.Out);
                     break;
             }

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

@@ -0,0 +1,43 @@
+// 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.Audio.Track;
+using osu.Framework.Graphics;
+using osuTK;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Graphics.Containers;
+using osu.Game.Skinning;
+
+namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
+{
+    public class ReverseArrowPiece : BeatSyncedContainer
+    {
+        public ReverseArrowPiece()
+        {
+            Divisor = 2;
+            MinimumBeatLength = 200;
+
+            Anchor = Anchor.Centre;
+            Origin = Anchor.Centre;
+
+            Blending = BlendingParameters.Additive;
+
+            Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
+
+            Child = new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.ReverseArrow), _ => new SpriteIcon
+            {
+                RelativeSizeAxes = Axes.Both,
+                Icon = FontAwesome.Solid.ChevronRight,
+                Size = new Vector2(0.35f)
+            })
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+            };
+        }
+
+        protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, TrackAmplitudes amplitudes) =>
+            Child.ScaleTo(1.3f).ScaleTo(1f, timingPoint.BeatLength, Easing.Out);
+    }
+}

osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs

@@ -5,6 +5,7 @@ using System;
 using System.IO;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using NUnit.Framework;
@@ -13,7 +14,9 @@ using osu.Game.IPC;
 using osu.Framework.Allocation;
 using osu.Framework.Logging;
 using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.Formats;
 using osu.Game.IO;
+using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Tests.Resources;
 using SharpCompress.Archives;
 using SharpCompress.Archives.Zip;
@@ -552,6 +555,83 @@ namespace osu.Game.Tests.Beatmaps.IO
             }
         }
 
+        [Test]
+        public async Task TestUpdateBeatmapInfo()
+        {
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestUpdateBeatmapInfo)))
+            {
+                try
+                {
+                    var osu = loadOsu(host);
+                    var manager = osu.Dependencies.Get<BeatmapManager>();
+
+                    var temp = TestResources.GetTestBeatmapForImport();
+                    await osu.Dependencies.Get<BeatmapManager>().Import(temp);
+
+                    // Update via the beatmap, not the beatmap info, to ensure correct linking
+                    BeatmapSetInfo setToUpdate = manager.GetAllUsableBeatmapSets()[0];
+                    Beatmap beatmapToUpdate = (Beatmap)manager.GetWorkingBeatmap(setToUpdate.Beatmaps.First(b => b.RulesetID == 0)).Beatmap;
+                    beatmapToUpdate.BeatmapInfo.Version = "updated";
+
+                    manager.Update(setToUpdate);
+
+                    BeatmapInfo updatedInfo = manager.QueryBeatmap(b => b.ID == beatmapToUpdate.BeatmapInfo.ID);
+                    Assert.That(updatedInfo.Version, Is.EqualTo("updated"));
+                }
+                finally
+                {
+                    host.Exit();
+                }
+            }
+        }
+
+        [Test]
+        public async Task TestUpdateBeatmapFile()
+        {
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestUpdateBeatmapFile)))
+            {
+                try
+                {
+                    var osu = loadOsu(host);
+                    var manager = osu.Dependencies.Get<BeatmapManager>();
+
+                    var temp = TestResources.GetTestBeatmapForImport();
+                    await osu.Dependencies.Get<BeatmapManager>().Import(temp);
+
+                    BeatmapSetInfo setToUpdate = manager.GetAllUsableBeatmapSets()[0];
+                    Beatmap beatmapToUpdate = (Beatmap)manager.GetWorkingBeatmap(setToUpdate.Beatmaps.First(b => b.RulesetID == 0)).Beatmap;
+                    BeatmapSetFileInfo fileToUpdate = setToUpdate.Files.First(f => beatmapToUpdate.BeatmapInfo.Path.Contains(f.Filename));
+
+                    using (var stream = new MemoryStream())
+                    {
+                        using (var writer = new StreamWriter(stream, Encoding.UTF8, 1024, true))
+                        {
+                            beatmapToUpdate.HitObjects.Clear();
+                            beatmapToUpdate.HitObjects.Add(new HitCircle { StartTime = 5000 });
+
+                            new LegacyBeatmapEncoder(beatmapToUpdate).Encode(writer);
+                        }
+
+                        stream.Seek(0, SeekOrigin.Begin);
+
+                        manager.UpdateFile(setToUpdate, fileToUpdate, stream);
+                    }
+
+                    // Check that the old file reference has been removed
+                    Assert.That(manager.QueryBeatmapSet(s => s.ID == setToUpdate.ID).Files.All(f => f.ID != fileToUpdate.ID));
+
+                    // Check that the new file is referenced correctly by attempting a retrieval
+                    Beatmap updatedBeatmap = (Beatmap)manager.GetWorkingBeatmap(manager.QueryBeatmap(b => b.ID == beatmapToUpdate.BeatmapInfo.ID)).Beatmap;
+                    Assert.That(updatedBeatmap.HitObjects.Count, Is.EqualTo(1));
+                    Assert.That(updatedBeatmap.HitObjects[0].StartTime, Is.EqualTo(5000));
+                }
+                finally
+                {
+                    host.Exit();
+                }
+            }
+        }
+
         public static async Task<BeatmapSetInfo> LoadOszIntoOsu(OsuGameBase osu, string path = null, bool virtualTrack = false)
         {
             var temp = path ?? TestResources.GetTestBeatmapForImport(virtualTrack);

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

@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -25,7 +26,7 @@ namespace osu.Game.Tests.Visual.Online
             typeof(ChannelTabControl),
         };
 
-        private readonly ChannelTabControl channelTabControl;
+        private readonly TestTabControl channelTabControl;
 
         public TestSceneChannelTabControl()
         {
@@ -37,7 +38,7 @@ namespace osu.Game.Tests.Visual.Online
                 Anchor = Anchor.Centre,
                 Children = new Drawable[]
                 {
-                    channelTabControl = new ChannelTabControl
+                    channelTabControl = new TestTabControl
                     {
                         RelativeSizeAxes = Axes.X,
                         Origin = Anchor.Centre,
@@ -73,32 +74,40 @@ namespace osu.Game.Tests.Visual.Online
             channelTabControl.Current.ValueChanged += channel => currentText.Text = "Currently selected channel: " + channel.NewValue;
 
             AddStep("Add random private channel", addRandomPrivateChannel);
-            AddAssert("There is only one channels", () => channelTabControl.Items.Count() == 2);
+            AddAssert("There is only one channels", () => channelTabControl.Items.Count == 2);
             AddRepeatStep("Add 3 random private channels", addRandomPrivateChannel, 3);
-            AddAssert("There are four channels", () => channelTabControl.Items.Count() == 5);
+            AddAssert("There are four channels", () => channelTabControl.Items.Count == 5);
             AddStep("Add random public channel", () => addChannel(RNG.Next().ToString()));
 
-            AddRepeatStep("Select a random channel", () => channelTabControl.Current.Value = channelTabControl.Items.ElementAt(RNG.Next(channelTabControl.Items.Count() - 1)), 20);
+            AddRepeatStep("Select a random channel", () =>
+            {
+                List<Channel> validChannels = channelTabControl.Items.Where(c => !(c is ChannelSelectorTabItem.ChannelSelectorTabChannel)).ToList();
+                channelTabControl.SelectChannel(validChannels[RNG.Next(0, validChannels.Count)]);
+            }, 20);
 
-            Channel channelBefore = channelTabControl.Items.First();
-            AddStep("set first channel", () => channelTabControl.Current.Value = channelBefore);
+            Channel channelBefore = null;
+            AddStep("set first channel", () => channelTabControl.SelectChannel(channelBefore = channelTabControl.Items.First(c => !(c is ChannelSelectorTabItem.ChannelSelectorTabChannel))));
 
-            AddStep("select selector tab", () => channelTabControl.Current.Value = channelTabControl.Items.Last());
+            AddStep("select selector tab", () => channelTabControl.SelectChannel(channelTabControl.Items.Single(c => c is ChannelSelectorTabItem.ChannelSelectorTabChannel)));
             AddAssert("selector tab is active", () => channelTabControl.ChannelSelectorActive.Value);
 
             AddAssert("check channel unchanged", () => channelBefore == channelTabControl.Current.Value);
 
-            AddStep("set second channel", () => channelTabControl.Current.Value = channelTabControl.Items.Skip(1).First());
+            AddStep("set second channel", () => channelTabControl.SelectChannel(channelTabControl.Items.GetNext(channelBefore)));
             AddAssert("selector tab is inactive", () => !channelTabControl.ChannelSelectorActive.Value);
 
             AddUntilStep("remove all channels", () =>
             {
-                var first = channelTabControl.Items.First();
-                if (first is ChannelSelectorTabItem.ChannelSelectorTabChannel)
-                    return true;
+                foreach (var item in channelTabControl.Items.ToList())
+                {
+                    if (item is ChannelSelectorTabItem.ChannelSelectorTabChannel)
+                        continue;
 
-                channelTabControl.RemoveChannel(first);
-                return false;
+                    channelTabControl.RemoveChannel(item);
+                    return false;
+                }
+
+                return true;
             });
 
             AddAssert("selector tab is active", () => channelTabControl.ChannelSelectorActive.Value);
@@ -117,5 +126,10 @@ namespace osu.Game.Tests.Visual.Online
                 Type = ChannelType.Public,
                 Name = name
             });
+
+        private class TestTabControl : ChannelTabControl
+        {
+            public void SelectChannel(Channel channel) => base.SelectTab(TabMap[channel]);
+        }
     }
 }

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

@@ -0,0 +1,76 @@
+// 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.Bindables;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Overlays.Rankings;
+using osu.Game.Users;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Shapes;
+using osuTK.Graphics;
+using osu.Game.Graphics.Sprites;
+
+namespace osu.Game.Tests.Visual.Online
+{
+    public class TestSceneRankingsCountryFilter : OsuTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(CountryFilter),
+            typeof(CountryPill)
+        };
+
+        public TestSceneRankingsCountryFilter()
+        {
+            var countryBindable = new Bindable<Country>();
+
+            AddRange(new Drawable[]
+            {
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = Color4.Gray,
+                },
+                new FillFlowContainer
+                {
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Direction = FillDirection.Vertical,
+                    Children = new Drawable[]
+                    {
+                        new CountryFilter
+                        {
+                            Anchor = Anchor.TopCentre,
+                            Origin = Anchor.TopCentre,
+                            Current = { BindTarget = countryBindable }
+                        },
+                        new OsuSpriteText
+                        {
+                            Anchor = Anchor.TopCentre,
+                            Origin = Anchor.TopCentre,
+                            Text = "Some content",
+                            Margin = new MarginPadding { Vertical = 20 }
+                        }
+                    }
+                }
+            });
+
+            var country = new Country
+            {
+                FlagName = "BY",
+                FullName = "Belarus"
+            };
+            var unknownCountry = new Country
+            {
+                FlagName = "CK",
+                FullName = "Cook Islands"
+            };
+
+            AddStep("Set country", () => countryBindable.Value = country);
+            AddStep("Set null country", () => countryBindable.Value = null);
+            AddStep("Set country with no flag", () => countryBindable.Value = unknownCountry);
+        }
+    }
+}

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

@@ -0,0 +1,62 @@
+// 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.Sprites;
+using osu.Game.Overlays.Mods;
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    public class TestSceneModButton : OsuTestScene
+    {
+        public TestSceneModButton()
+        {
+            Children = new Drawable[]
+            {
+                new ModButton(new MultiMod(new TestMod1(), new TestMod2(), new TestMod3(), new TestMod4()))
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre
+                }
+            };
+        }
+
+        private class TestMod1 : TestMod
+        {
+            public override string Name => "Test mod 1";
+
+            public override string Acronym => "M1";
+        }
+
+        private class TestMod2 : TestMod
+        {
+            public override string Name => "Test mod 2";
+
+            public override string Acronym => "M2";
+
+            public override IconUsage? Icon => FontAwesome.Solid.Exclamation;
+        }
+
+        private class TestMod3 : TestMod
+        {
+            public override string Name => "Test mod 3";
+
+            public override string Acronym => "M3";
+
+            public override IconUsage? Icon => FontAwesome.Solid.ArrowRight;
+        }
+
+        private class TestMod4 : TestMod
+        {
+            public override string Name => "Test mod 4";
+
+            public override string Acronym => "M4";
+        }
+
+        private abstract class TestMod : Mod, IApplicableMod
+        {
+            public override double ScoreMultiplier => 1.0;
+        }
+    }
+}

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

@@ -1,7 +1,6 @@
 // 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.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
@@ -62,7 +61,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             waitForCurrent();
             pushNext();
             waitForCurrent();
-            AddAssert(@"only 2 items", () => breadcrumbs.Items.Count() == 2);
+            AddAssert(@"only 2 items", () => breadcrumbs.Items.Count == 2);
             AddStep(@"exit current", () => screenStack.CurrentScreen.Exit());
             AddAssert(@"current screen is first", () => startScreen == screenStack.CurrentScreen);
         }

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

@@ -44,7 +44,7 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             AddStep("Select random", () =>
             {
-                selector.Current.Value = selector.Items.ElementAt(RNG.Next(selector.Items.Count()));
+                selector.Current.Value = selector.Items.ElementAt(RNG.Next(selector.Items.Count));
             });
             AddStep("Toggle disabled state", () => selector.Current.Disabled = !selector.Current.Disabled);
         }

osu.Game.Tournament/TournamentFont.cs

@@ -61,7 +61,7 @@ namespace osu.Game.Tournament
             string weightString = weight.ToString();
 
             // Only exo has an explicit "regular" weight, other fonts do not
-            if (weight == FontWeight.Regular && family != GetFamilyString(TournamentTypeface.Aquatico) && family != GetFamilyString(TournamentTypeface.Aquatico))
+            if (weight == FontWeight.Regular && family != GetFamilyString(TournamentTypeface.Aquatico))
                 weightString = string.Empty;
 
             return weightString;

osu.Game/Beatmaps/BeatmapManager.cs

@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Linq.Expressions;
+using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
@@ -26,6 +27,8 @@ using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Objects;
+using Decoder = osu.Game.Beatmaps.Formats.Decoder;
+using ZipArchive = SharpCompress.Archives.Zip.ZipArchive;
 
 namespace osu.Game.Beatmaps
 {
@@ -56,14 +59,11 @@ namespace osu.Game.Beatmaps
         protected override string ImportFromStablePath => "Songs";
 
         private readonly RulesetStore rulesets;
-
         private readonly BeatmapStore beatmaps;
-
         private readonly AudioManager audioManager;
-
         private readonly GameHost host;
-
         private readonly BeatmapUpdateQueue updateQueue;
+        private readonly Storage exportStorage;
 
         public BeatmapManager(Storage storage, IDatabaseContextFactory contextFactory, RulesetStore rulesets, IAPIProvider api, AudioManager audioManager, GameHost host = null,
                               WorkingBeatmap defaultBeatmap = null)
@@ -80,6 +80,7 @@ namespace osu.Game.Beatmaps
             beatmaps.BeatmapRestored += b => BeatmapRestored?.Invoke(b);
 
             updateQueue = new BeatmapUpdateQueue(api);
+            exportStorage = storage.GetStorageForDirectory("exports");
         }
 
         protected override ArchiveDownloadRequest<BeatmapSetInfo> CreateDownloadRequest(BeatmapSetInfo set, bool minimiseDownloadSize) =>
@@ -174,6 +175,50 @@ namespace osu.Game.Beatmaps
         /// <param name="beatmap">The beatmap difficulty to restore.</param>
         public void Restore(BeatmapInfo beatmap) => beatmaps.Restore(beatmap);
 
+        /// <summary>
+        /// Saves an <see cref="IBeatmap"/> file against a given <see cref="BeatmapInfo"/>.
+        /// </summary>
+        /// <param name="info">The <see cref="BeatmapInfo"/> to save the content against. The file referenced by <see cref="BeatmapInfo.Path"/> will be replaced.</param>
+        /// <param name="beatmapContent">The <see cref="IBeatmap"/> content to write.</param>
+        public void Save(BeatmapInfo info, IBeatmap beatmapContent)
+        {
+            var setInfo = QueryBeatmapSet(s => s.Beatmaps.Any(b => b.ID == info.ID));
+
+            using (var stream = new MemoryStream())
+            {
+                using (var sw = new StreamWriter(stream, Encoding.UTF8, 1024, true))
+                    new LegacyBeatmapEncoder(beatmapContent).Encode(sw);
+
+                stream.Seek(0, SeekOrigin.Begin);
+
+                UpdateFile(setInfo, setInfo.Files.Single(f => string.Equals(f.Filename, info.Path, StringComparison.OrdinalIgnoreCase)), stream);
+            }
+
+            var working = workingCache.FirstOrDefault(w => w.BeatmapInfo?.ID == info.ID);
+            if (working != null)
+                workingCache.Remove(working);
+        }
+
+        /// <summary>
+        /// Exports a <see cref="BeatmapSetInfo"/> to an .osz package.
+        /// </summary>
+        /// <param name="set">The <see cref="BeatmapSetInfo"/> to export.</param>
+        public void Export(BeatmapSetInfo set)
+        {
+            var localSet = QueryBeatmapSet(s => s.ID == set.ID);
+
+            using (var archive = ZipArchive.Create())
+            {
+                foreach (var file in localSet.Files)
+                    archive.AddEntry(file.Filename, Files.Storage.GetStream(file.FileInfo.StoragePath));
+
+                using (var outputStream = exportStorage.GetStream($"{set}.osz", FileAccess.Write, FileMode.Create))
+                    archive.SaveTo(outputStream);
+
+                exportStorage.OpenInNativeExplorer();
+            }
+        }
+
         private readonly WeakList<WorkingBeatmap> workingCache = new WeakList<WorkingBeatmap>();
 
         /// <summary>

osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs

@@ -63,7 +63,7 @@ namespace osu.Game.Beatmaps.Formats
             writer.WriteLine(FormattableString.Invariant($"PreviewTime: {beatmap.Metadata.PreviewTime}"));
             // Todo: Not all countdown types are supported by lazer yet
             writer.WriteLine(FormattableString.Invariant($"Countdown: {(beatmap.BeatmapInfo.Countdown ? '1' : '0')}"));
-            writer.WriteLine(FormattableString.Invariant($"SampleSet: {toLegacySampleBank(beatmap.ControlPointInfo.SamplePoints[0].SampleBank)}"));
+            writer.WriteLine(FormattableString.Invariant($"SampleSet: {toLegacySampleBank(beatmap.ControlPointInfo.SamplePointAt(double.MinValue).SampleBank)}"));
             writer.WriteLine(FormattableString.Invariant($"StackLeniency: {beatmap.BeatmapInfo.StackLeniency}"));
             writer.WriteLine(FormattableString.Invariant($"Mode: {beatmap.BeatmapInfo.RulesetID}"));
             writer.WriteLine(FormattableString.Invariant($"LetterboxInBreaks: {(beatmap.BeatmapInfo.LetterboxInBreaks ? '1' : '0')}"));

osu.Game/Beatmaps/WorkingBeatmap.cs

@@ -7,13 +7,11 @@ using osu.Game.Rulesets.Mods;
 using System;
 using System.Collections.Generic;
 using osu.Game.Storyboards;
-using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using osu.Framework.Audio;
 using osu.Framework.Statistics;
-using osu.Game.IO.Serialization;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.UI;
@@ -76,21 +74,6 @@ namespace osu.Game.Beatmaps
             return AudioManager.Tracks.GetVirtual(length);
         }
 
-        /// <summary>
-        /// Saves the <see cref="Beatmaps.Beatmap"/>.
-        /// </summary>
-        /// <returns>The absolute path of the output file.</returns>
-        public string Save()
-        {
-            string directory = Path.Combine(Path.GetTempPath(), @"osu!");
-            Directory.CreateDirectory(directory);
-
-            var path = Path.Combine(directory, Guid.NewGuid().ToString().Replace("-", string.Empty) + ".json");
-            using (var sw = new StreamWriter(path))
-                sw.WriteLine(Beatmap.Serialize());
-            return path;
-        }
-
         /// <summary>
         /// Creates a <see cref="IBeatmapConverter"/> to convert a <see cref="IBeatmap"/> for a specified <see cref="Ruleset"/>.
         /// </summary>

osu.Game/Database/ArchiveModelManager.cs

@@ -34,7 +34,7 @@ namespace osu.Game.Database
     /// <typeparam name="TFileModel">The associated file join type.</typeparam>
     public abstract class ArchiveModelManager<TModel, TFileModel> : ICanAcceptFiles, IModelManager<TModel>
         where TModel : class, IHasFiles<TFileModel>, IHasPrimaryKey, ISoftDelete
-        where TFileModel : INamedFileInfo, new()
+        where TFileModel : class, INamedFileInfo, new()
     {
         private const int import_queue_request_concurrency = 1;
 
@@ -222,9 +222,8 @@ namespace osu.Game.Database
             {
                 model = CreateModel(archive);
 
-                if (model == null) return Task.FromResult<TModel>(null);
-
-                model.Hash = computeHash(archive);
+                if (model == null)
+                    return Task.FromResult<TModel>(null);
             }
             catch (TaskCanceledException)
             {
@@ -262,18 +261,24 @@ namespace osu.Game.Database
         /// <remarks>
         ///  In the case of no matching files, a hash will be generated from the passed archive's <see cref="ArchiveReader.Name"/>.
         /// </remarks>
-        private string computeHash(ArchiveReader reader)
+        private string computeHash(TModel item, ArchiveReader reader = null)
         {
             // for now, concatenate all .osu files in the set to create a unique hash.
             MemoryStream hashable = new MemoryStream();
 
-            foreach (string file in reader.Filenames.Where(f => HashableFileTypes.Any(f.EndsWith)))
+            foreach (TFileModel file in item.Files.Where(f => HashableFileTypes.Any(f.Filename.EndsWith)))
             {
-                using (Stream s = reader.GetStream(file))
+                using (Stream s = Files.Store.GetStream(file.FileInfo.StoragePath))
                     s.CopyTo(hashable);
             }
 
-            return hashable.Length > 0 ? hashable.ComputeSHA2Hash() : reader.Name.ComputeSHA2Hash();
+            if (hashable.Length > 0)
+                return hashable.ComputeSHA2Hash();
+
+            if (reader != null)
+                return reader.Name.ComputeSHA2Hash();
+
+            return item.Hash;
         }
 
         /// <summary>
@@ -303,6 +308,7 @@ namespace osu.Game.Database
                 LogForModel(item, "Beginning import...");
 
                 item.Files = archive != null ? createFileInfos(archive, Files) : new List<TFileModel>();
+                item.Hash = computeHash(item, archive);
 
                 await Populate(item, archive, cancellationToken);
 
@@ -358,12 +364,42 @@ namespace osu.Game.Database
             return item;
         }, cancellationToken, TaskCreationOptions.HideScheduler, import_scheduler).Unwrap();
 
+        public void UpdateFile(TModel model, TFileModel file, Stream contents)
+        {
+            using (var usage = ContextFactory.GetForWrite())
+            {
+                // Dereference the existing file info, since the file model will be removed.
+                Files.Dereference(file.FileInfo);
+
+                // Remove the file model.
+                usage.Context.Set<TFileModel>().Remove(file);
+
+                // Add the new file info and containing file model.
+                model.Files.Remove(file);
+                model.Files.Add(new TFileModel
+                {
+                    Filename = file.Filename,
+                    FileInfo = Files.Add(contents)
+                });
+
+                Update(model);
+            }
+        }
+
         /// <summary>
         /// Perform an update of the specified item.
-        /// TODO: Support file changes.
+        /// TODO: Support file additions/removals.
         /// </summary>
         /// <param name="item">The item to update.</param>
-        public void Update(TModel item) => ModelStore.Update(item);
+        public void Update(TModel item)
+        {
+            using (ContextFactory.GetForWrite())
+            {
+                item.Hash = computeHash(item);
+
+                ModelStore.Update(item);
+            }
+        }
 
         /// <summary>
         /// Delete an item from the manager.

osu.Game/Database/DownloadableArchiveModelManager.cs

@@ -21,7 +21,7 @@ namespace osu.Game.Database
     /// <typeparam name="TFileModel">The associated file join type.</typeparam>
     public abstract class DownloadableArchiveModelManager<TModel, TFileModel> : ArchiveModelManager<TModel, TFileModel>, IModelDownloader<TModel>
         where TModel : class, IHasFiles<TFileModel>, IHasPrimaryKey, ISoftDelete, IEquatable<TModel>
-        where TFileModel : INamedFileInfo, new()
+        where TFileModel : class, INamedFileInfo, new()
     {
         public event Action<ArchiveDownloadRequest<TModel>> DownloadBegan;
 

osu.Game/Graphics/Containers/BeatSyncedContainer.cs

@@ -38,6 +38,11 @@ namespace osu.Game.Graphics.Containers
         /// </summary>
         public int Divisor { get; set; } = 1;
 
+        /// <summary>
+        /// An optional minimum beat length. Any beat length below this will be multiplied by two until valid.
+        /// </summary>
+        public double MinimumBeatLength { get; set; }
+
         /// <summary>
         /// Default length of a beat in milliseconds. Used whenever there is no beatmap or track playing.
         /// </summary>
@@ -89,6 +94,9 @@ namespace osu.Game.Graphics.Containers
 
             double beatLength = timingPoint.BeatLength / Divisor;
 
+            while (beatLength < MinimumBeatLength)
+                beatLength *= 2;
+
             int beatIndex = (int)((currentTrackTime - timingPoint.Time) / beatLength) - (effectPoint.OmitFirstBarLine ? 1 : 0);
 
             // The beats before the start of the first control point are off by 1, this should do the trick

osu.Game/Graphics/Containers/LinkFlowContainer.cs

@@ -63,7 +63,7 @@ namespace osu.Game.Graphics.Containers
         }
 
         public void AddUserLink(User user, Action<SpriteText> creationParameters = null)
-            => createLink(AddText(user.Username, creationParameters), new LinkDetails(LinkAction.OpenUserProfile, user.Id.ToString()), "View Profile");
+            => createLink(AddText(user.Username, creationParameters), new LinkDetails(LinkAction.OpenUserProfile, user.Id.ToString()), "view profile");
 
         private void createLink(IEnumerable<Drawable> drawables, LinkDetails link, string tooltipText, Action action = null)
         {

osu.Game/Graphics/UserInterface/ExternalLinkButton.cs

@@ -57,6 +57,6 @@ namespace osu.Game.Graphics.UserInterface
             return true;
         }
 
-        public string TooltipText => "View in browser";
+        public string TooltipText => "view in browser";
     }
 }

osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs

@@ -104,7 +104,7 @@ namespace osu.Game.Graphics.UserInterface
 
         private class CapsWarning : SpriteIcon, IHasTooltip
         {
-            public string TooltipText => @"Caps lock is active";
+            public string TooltipText => @"caps lock is active";
 
             public CapsWarning()
             {

osu.Game/Input/Bindings/GlobalActionContainer.cs

@@ -24,6 +24,7 @@ namespace osu.Game.Input.Bindings
 
         public IEnumerable<KeyBinding> GlobalKeyBindings => new[]
         {
+            new KeyBinding(InputKey.F6, GlobalAction.ToggleNowPlaying),
             new KeyBinding(InputKey.F8, GlobalAction.ToggleChat),
             new KeyBinding(InputKey.F9, GlobalAction.ToggleSocial),
             new KeyBinding(InputKey.F10, GlobalAction.ToggleGameplayMouseButtons),
@@ -137,5 +138,8 @@ namespace osu.Game.Input.Bindings
 
         [Description("Play / pause")]
         MusicPlay,
+
+        [Description("Toggle now playing overlay")]
+        ToggleNowPlaying,
     }
 }

osu.Game/Online/API/APIRequest.cs

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

osu.Game/Online/API/OAuth.cs

@@ -4,7 +4,6 @@
 using System.Diagnostics;
 using System.Net.Http;
 using osu.Framework.Bindables;
-using osu.Framework.IO.Network;
 
 namespace osu.Game.Online.API
 {
@@ -166,7 +165,7 @@ namespace osu.Game.Online.API
             }
         }
 
-        private class AccessTokenRequest : JsonWebRequest<OAuthToken>
+        private class AccessTokenRequest : OsuJsonWebRequest<OAuthToken>
         {
             protected string GrantType;
 

osu.Game/Online/API/OsuJsonWebRequest.cs

@@ -0,0 +1,21 @@
+// 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.IO.Network;
+
+namespace osu.Game.Online.API
+{
+    public class OsuJsonWebRequest<T> : JsonWebRequest<T>
+    {
+        public OsuJsonWebRequest(string uri)
+            : base(uri)
+        {
+        }
+
+        public OsuJsonWebRequest()
+        {
+        }
+
+        protected override string UserAgent => "osu!";
+    }
+}

osu.Game/Online/API/OsuWebRequest.cs

@@ -0,0 +1,21 @@
+// 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.IO.Network;
+
+namespace osu.Game.Online.API
+{
+    public class OsuWebRequest : WebRequest
+    {
+        public OsuWebRequest(string uri)
+            : base(uri)
+        {
+        }
+
+        public OsuWebRequest()
+        {
+        }
+
+        protected override string UserAgent => "osu!";
+    }
+}

osu.Game/Online/API/RegistrationRequest.cs

@@ -2,11 +2,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using Newtonsoft.Json;
-using osu.Framework.IO.Network;
 
 namespace osu.Game.Online.API
 {
-    public class RegistrationRequest : WebRequest
+    public class RegistrationRequest : OsuWebRequest
     {
         internal string Username;
         internal string Email;

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

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

osu.Game/Online/Chat/Channel.cs

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

osu.Game/Online/Chat/ChannelManager.cs

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

osu.Game/OsuGame.cs

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

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

@@ -24,7 +24,7 @@ namespace osu.Game.Overlays.BeatmapSet.Buttons
     {
         private readonly bool noVideo;
 
-        public string TooltipText => button.Enabled.Value ? "Download this beatmap" : "Login to download";
+        public string TooltipText => button.Enabled.Value ? "download this beatmap" : "login to download";
 
         private readonly IBindable<User> localUser = new Bindable<User>();
 

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

@@ -81,7 +81,10 @@ namespace osu.Game.Overlays.Chat.Tabs
             RemoveItem(channel);
 
             if (Current.Value == channel)
-                Current.Value = Items.FirstOrDefault();
+            {
+                // Prefer non-selector channels first
+                Current.Value = Items.FirstOrDefault(c => !(c is ChannelSelectorTabItem.ChannelSelectorTabChannel)) ?? Items.FirstOrDefault();
+            }
         }
 
         protected override void SelectTab(TabItem<Channel> tab)

osu.Game/Overlays/ChatOverlay.cs

@@ -279,6 +279,10 @@ namespace osu.Game.Overlays
                 currentChannelContainer.Clear(false);
                 currentChannelContainer.Add(loaded);
             }
+
+            // mark channel as read when channel switched
+            if (e.NewValue.Messages.Any())
+                channelManager.MarkChannelAsRead(e.NewValue);
         }
 
         private float startDragChatHeight;

osu.Game/Overlays/Direct/PanelDownloadButton.cs

@@ -48,7 +48,7 @@ namespace osu.Game.Overlays.Direct
             if (BeatmapSet.Value.OnlineInfo.Availability?.DownloadDisabled ?? false)
             {
                 button.Enabled.Value = false;
-                button.TooltipText = "This beatmap is currently not available for download.";
+                button.TooltipText = "this beatmap is currently not available for download.";
                 return;
             }
 

osu.Game/Overlays/Mods/ModButton.cs

@@ -80,7 +80,7 @@ namespace osu.Game.Overlays.Mods
                 foregroundIcon.RotateTo(rotate_angle * direction, mod_switch_duration, mod_switch_easing);
                 backgroundIcon.RotateTo(-rotate_angle * direction, mod_switch_duration, mod_switch_easing);
 
-                backgroundIcon.Icon = modAfter.Icon;
+                backgroundIcon.Mod = modAfter;
 
                 using (BeginDelayedSequence(mod_switch_duration, true))
                 {
@@ -218,8 +218,8 @@ namespace osu.Game.Overlays.Mods
         private void displayMod(Mod mod)
         {
             if (backgroundIcon != null)
-                backgroundIcon.Icon = foregroundIcon.Icon;
-            foregroundIcon.Icon = mod.Icon;
+                backgroundIcon.Mod = foregroundIcon.Mod;
+            foregroundIcon.Mod = mod;
             text.Text = mod.Name;
             Colour = mod.HasImplementation ? Color4.White : Color4.Gray;
         }

osu.Game/Overlays/News/NewsArticleCover.cs

@@ -11,6 +11,7 @@ using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
+using osu.Framework.Input.Events;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osuTK.Graphics;
@@ -19,6 +20,10 @@ namespace osu.Game.Overlays.News
 {
     public class NewsArticleCover : Container
     {
+        private const int hover_duration = 300;
+
+        private readonly Box gradient;
+
         public NewsArticleCover(ArticleInfo info)
         {
             RelativeSizeAxes = Axes.X;
@@ -47,11 +52,11 @@ namespace osu.Game.Overlays.News
                     Origin = Anchor.Centre,
                     RelativeSizeAxes = Axes.Both,
                 },
-                new Box
+                gradient = new Box
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Colour = ColourInfo.GradientVertical(Color4.Black.Opacity(0.1f), Color4.Black.Opacity(0.6f)),
-                    Alpha = 1f,
+                    Colour = ColourInfo.GradientVertical(Color4.Black.Opacity(0.1f), Color4.Black.Opacity(0.7f)),
+                    Alpha = 0
                 },
                 new DateContainer(info.Time)
                 {
@@ -90,6 +95,18 @@ namespace osu.Game.Overlays.News
             bg.OnLoadComplete += d => d.FadeIn(250, Easing.In);
         }
 
+        protected override bool OnHover(HoverEvent e)
+        {
+            gradient.FadeIn(hover_duration, Easing.OutQuint);
+            return base.OnHover(e);
+        }
+
+        protected override void OnHoverLost(HoverLostEvent e)
+        {
+            base.OnHoverLost(e);
+            gradient.FadeOut(hover_duration, Easing.OutQuint);
+        }
+
         [LongRunningLoad]
         private class NewsBackground : Sprite
         {

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

@@ -24,7 +24,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
 
         public LevelBadge()
         {
-            TooltipText = "Level";
+            TooltipText = "level";
         }
 
         [BackgroundDependencyLoader]

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

@@ -25,7 +25,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
 
         public LevelProgressBar()
         {
-            TooltipText = "Progress to next level";
+            TooltipText = "progress to next level";
         }
 
         [BackgroundDependencyLoader]

osu.Game/Overlays/Rankings/CountryFilter.cs

@@ -0,0 +1,105 @@
+// 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.Framework.Graphics.UserInterface;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Users;
+using osuTK;
+
+namespace osu.Game.Overlays.Rankings
+{
+    public class CountryFilter : CompositeDrawable, IHasCurrentValue<Country>
+    {
+        private const int duration = 200;
+        private const int height = 50;
+
+        private readonly BindableWithCurrent<Country> current = new BindableWithCurrent<Country>();
+
+        public Bindable<Country> Current
+        {
+            get => current.Current;
+            set => current.Current = value;
+        }
+
+        private readonly Box background;
+        private readonly CountryPill countryPill;
+        private readonly Container content;
+
+        public CountryFilter()
+        {
+            RelativeSizeAxes = Axes.X;
+
+            InternalChild = content = new Container
+            {
+                RelativeSizeAxes = Axes.X,
+                Height = height,
+                Alpha = 0,
+                Children = new Drawable[]
+                {
+                    background = new Box
+                    {
+                        RelativeSizeAxes = Axes.Both
+                    },
+                    new FillFlowContainer
+                    {
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                        Direction = FillDirection.Horizontal,
+                        Spacing = new Vector2(10, 0),
+                        Margin = new MarginPadding { Left = UserProfileOverlay.CONTENT_X_MARGIN },
+                        Children = new Drawable[]
+                        {
+                            new OsuSpriteText
+                            {
+                                Anchor = Anchor.CentreLeft,
+                                Origin = Anchor.CentreLeft,
+                                Text = @"filtered by country:",
+                                Font = OsuFont.GetFont(size: 14)
+                            },
+                            countryPill = new CountryPill
+                            {
+                                Anchor = Anchor.CentreLeft,
+                                Origin = Anchor.CentreLeft,
+                                Alpha = 0,
+                                Current = Current
+                            }
+                        }
+                    }
+                }
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            background.Colour = colours.GreySeafoam;
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            Current.BindValueChanged(onCountryChanged, true);
+        }
+
+        private void onCountryChanged(ValueChangedEvent<Country> country)
+        {
+            if (country.NewValue == null)
+            {
+                countryPill.Collapse();
+                this.ResizeHeightTo(0, duration, Easing.OutQuint);
+                content.FadeOut(duration, Easing.OutQuint);
+                return;
+            }
+
+            this.ResizeHeightTo(height, duration, Easing.OutQuint);
+            content.FadeIn(duration, Easing.OutQuint);
+            countryPill.Expand();
+        }
+    }
+}

osu.Game/Overlays/Rankings/CountryPill.cs

@@ -0,0 +1,164 @@
+// 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 osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.UserInterface;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Users;
+using osu.Game.Users.Drawables;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Overlays.Rankings
+{
+    public class CountryPill : CompositeDrawable, IHasCurrentValue<Country>
+    {
+        private const int duration = 200;
+
+        private readonly BindableWithCurrent<Country> current = new BindableWithCurrent<Country>();
+
+        public Bindable<Country> Current
+        {
+            get => current.Current;
+            set => current.Current = value;
+        }
+
+        private readonly Container content;
+        private readonly Box background;
+        private readonly UpdateableFlag flag;
+        private readonly OsuSpriteText countryName;
+
+        public CountryPill()
+        {
+            AutoSizeAxes = Axes.Both;
+
+            InternalChild = content = new CircularContainer
+            {
+                Height = 25,
+                AutoSizeDuration = duration,
+                AutoSizeEasing = Easing.OutQuint,
+                Masking = true,
+                Children = new Drawable[]
+                {
+                    background = new Box
+                    {
+                        RelativeSizeAxes = Axes.Both
+                    },
+                    new FillFlowContainer
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        RelativeSizeAxes = Axes.Y,
+                        AutoSizeAxes = Axes.X,
+                        Margin = new MarginPadding { Horizontal = 10 },
+                        Direction = FillDirection.Horizontal,
+                        Spacing = new Vector2(8, 0),
+                        Children = new Drawable[]
+                        {
+                            new FillFlowContainer
+                            {
+                                RelativeSizeAxes = Axes.Y,
+                                AutoSizeAxes = Axes.X,
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                Direction = FillDirection.Horizontal,
+                                Spacing = new Vector2(3, 0),
+                                Children = new Drawable[]
+                                {
+                                    flag = new UpdateableFlag
+                                    {
+                                        Anchor = Anchor.Centre,
+                                        Origin = Anchor.Centre,
+                                        Size = new Vector2(22, 15)
+                                    },
+                                    countryName = new OsuSpriteText
+                                    {
+                                        Anchor = Anchor.Centre,
+                                        Origin = Anchor.Centre,
+                                        Font = OsuFont.GetFont(size: 14)
+                                    }
+                                }
+                            },
+                            new CloseButton
+                            {
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                Action = () => Current.Value = null
+                            }
+                        }
+                    }
+                }
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            background.Colour = colours.GreySeafoamDarker;
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            Current.BindValueChanged(onCountryChanged, true);
+        }
+
+        public void Expand()
+        {
+            content.ClearTransforms();
+            content.AutoSizeAxes = Axes.X;
+
+            this.FadeIn(duration, Easing.OutQuint);
+        }
+
+        public void Collapse()
+        {
+            content.ClearTransforms();
+            content.AutoSizeAxes = Axes.None;
+            content.ResizeWidthTo(0, duration, Easing.OutQuint);
+
+            this.FadeOut(duration, Easing.OutQuint);
+        }
+
+        private void onCountryChanged(ValueChangedEvent<Country> country)
+        {
+            if (country.NewValue == null)
+                return;
+
+            flag.Country = country.NewValue;
+            countryName.Text = country.NewValue.FullName;
+        }
+
+        private class CloseButton : OsuHoverContainer
+        {
+            private readonly SpriteIcon icon;
+
+            protected override IEnumerable<Drawable> EffectTargets => new[] { icon };
+
+            public CloseButton()
+            {
+                AutoSizeAxes = Axes.Both;
+                Add(icon = new SpriteIcon
+                {
+                    Size = new Vector2(8),
+                    Icon = FontAwesome.Solid.Times
+                });
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours)
+            {
+                IdleColour = colours.GreySeafoamLighter;
+                HoverColour = Color4.White;
+            }
+        }
+    }
+}

osu.Game/Overlays/Settings/Sections/Input/KeyboardSettings.cs

@@ -16,7 +16,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
                 new SettingsButton
                 {
                     Text = "Key configuration",
-                    TooltipText = "Change global shortcut keys and gameplay bindings",
+                    TooltipText = "change global shortcut keys and gameplay bindings",
                     Action = keyConfig.ToggleVisibility
                 },
             };

osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs

@@ -87,7 +87,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         private class SensitivitySlider : OsuSliderBar<double>
         {
-            public override string TooltipText => Current.Disabled ? "Enable raw input to adjust sensitivity" : $"{base.TooltipText}x";
+            public override string TooltipText => Current.Disabled ? "enable raw input to adjust sensitivity" : $"{base.TooltipText}x";
         }
     }
 }

osu.Game/Overlays/Settings/SettingsItem.cs

@@ -161,7 +161,7 @@ namespace osu.Game.Overlays.Settings
                 UpdateState();
             }
 
-            public string TooltipText => "Revert to default";
+            public string TooltipText => "revert to default";
 
             protected override bool OnClick(ClickEvent e)
             {

osu.Game/Rulesets/Mods/Mod.cs

@@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.Mods
         /// The icon of this mod.
         /// </summary>
         [JsonIgnore]
-        public virtual IconUsage Icon => FontAwesome.Solid.Question;
+        public virtual IconUsage? Icon => null;
 
         /// <summary>
         /// The type of this mod.

osu.Game/Rulesets/Mods/ModAutoplay.cs

@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Mods
     {
         public override string Name => "Autoplay";
         public override string Acronym => "AT";
-        public override IconUsage Icon => OsuIcon.ModAuto;
+        public override IconUsage? Icon => OsuIcon.ModAuto;
         public override ModType Type => ModType.Automation;
         public override string Description => "Watch a perfect automated play through the song.";
         public override double ScoreMultiplier => 1;

osu.Game/Rulesets/Mods/ModCinema.cs

@@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Mods
     {
         public override string Name => "Cinema";
         public override string Acronym => "CN";
-        public override IconUsage Icon => OsuIcon.ModCinema;
+        public override IconUsage? Icon => OsuIcon.ModCinema;
         public override string Description => "Watch the video without visual distractions.";
 
         public void ApplyToHUD(HUDOverlay overlay)

osu.Game/Rulesets/Mods/ModDaycore.cs

@@ -12,7 +12,7 @@ namespace osu.Game.Rulesets.Mods
     {
         public override string Name => "Daycore";
         public override string Acronym => "DC";
-        public override IconUsage Icon => FontAwesome.Solid.Question;
+        public override IconUsage? Icon => null;
         public override string Description => "Whoaaaaa...";
 
         private readonly BindableNumber<double> tempoAdjust = new BindableDouble(1);

osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs

@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Mods
 
         public override ModType Type => ModType.Conversion;
 
-        public override IconUsage Icon => FontAwesome.Solid.Hammer;
+        public override IconUsage? Icon => FontAwesome.Solid.Hammer;
 
         public override double ScoreMultiplier => 1.0;
 

osu.Game/Rulesets/Mods/ModDoubleTime.cs

@@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Mods
     {
         public override string Name => "Double Time";
         public override string Acronym => "DT";
-        public override IconUsage Icon => OsuIcon.ModDoubletime;
+        public override IconUsage? Icon => OsuIcon.ModDoubletime;
         public override ModType Type => ModType.DifficultyIncrease;
         public override string Description => "Zoooooooooom...";
         public override bool Ranked => true;

osu.Game/Rulesets/Mods/ModEasy.cs

@@ -15,7 +15,7 @@ namespace osu.Game.Rulesets.Mods
     {
         public override string Name => "Easy";
         public override string Acronym => "EZ";
-        public override IconUsage Icon => OsuIcon.ModEasy;
+        public override IconUsage? Icon => OsuIcon.ModEasy;
         public override ModType Type => ModType.DifficultyReduction;
         public override double ScoreMultiplier => 0.5;
         public override bool Ranked => true;

osu.Game/Rulesets/Mods/ModFlashlight.cs

@@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.Mods
     {
         public override string Name => "Flashlight";
         public override string Acronym => "FL";
-        public override IconUsage Icon => OsuIcon.ModFlashlight;
+        public override IconUsage? Icon => OsuIcon.ModFlashlight;
         public override ModType Type => ModType.DifficultyIncrease;
         public override string Description => "Restricted view area.";
         public override bool Ranked => true;

osu.Game/Rulesets/Mods/ModHalfTime.cs

@@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Mods
     {
         public override string Name => "Half Time";
         public override string Acronym => "HT";
-        public override IconUsage Icon => OsuIcon.ModHalftime;
+        public override IconUsage? Icon => OsuIcon.ModHalftime;
         public override ModType Type => ModType.DifficultyReduction;
         public override string Description => "Less zoom...";
         public override bool Ranked => true;

osu.Game/Rulesets/Mods/ModHardRock.cs

@@ -12,7 +12,7 @@ namespace osu.Game.Rulesets.Mods
     {
         public override string Name => "Hard Rock";
         public override string Acronym => "HR";
-        public override IconUsage Icon => OsuIcon.ModHardrock;
+        public override IconUsage? Icon => OsuIcon.ModHardrock;
         public override ModType Type => ModType.DifficultyIncrease;
         public override string Description => "Everything just got a bit harder...";
         public override Type[] IncompatibleMods => new[] { typeof(ModEasy), typeof(ModDifficultyAdjust) };

osu.Game/Rulesets/Mods/ModHidden.cs

@@ -17,7 +17,7 @@ namespace osu.Game.Rulesets.Mods
     {
         public override string Name => "Hidden";
         public override string Acronym => "HD";
-        public override IconUsage Icon => OsuIcon.ModHidden;
+        public override IconUsage? Icon => OsuIcon.ModHidden;
         public override ModType Type => ModType.DifficultyIncrease;
         public override bool Ranked => true;
 

osu.Game/Rulesets/Mods/ModNightcore.cs

@@ -23,7 +23,7 @@ namespace osu.Game.Rulesets.Mods
     {
         public override string Name => "Nightcore";
         public override string Acronym => "NC";
-        public override IconUsage Icon => OsuIcon.ModNightcore;
+        public override IconUsage? Icon => OsuIcon.ModNightcore;
         public override string Description => "Uguuuuuuuu...";
 
         private readonly BindableNumber<double> tempoAdjust = new BindableDouble(1);

osu.Game/Rulesets/Mods/ModNoFail.cs

@@ -11,7 +11,7 @@ namespace osu.Game.Rulesets.Mods
     {
         public override string Name => "No Fail";
         public override string Acronym => "NF";
-        public override IconUsage Icon => OsuIcon.ModNofail;
+        public override IconUsage? Icon => OsuIcon.ModNofail;
         public override ModType Type => ModType.DifficultyReduction;
         public override string Description => "You can't fail, no matter what.";
         public override double ScoreMultiplier => 0.5;

osu.Game/Rulesets/Mods/ModNoMod.cs

@@ -13,7 +13,7 @@ namespace osu.Game.Rulesets.Mods
         public override string Name => "No Mod";
         public override string Acronym => "NM";
         public override double ScoreMultiplier => 1;
-        public override IconUsage Icon => FontAwesome.Solid.Ban;
+        public override IconUsage? Icon => FontAwesome.Solid.Ban;
         public override ModType Type => ModType.System;
     }
 }

osu.Game/Rulesets/Mods/ModPerfect.cs

@@ -12,7 +12,7 @@ namespace osu.Game.Rulesets.Mods
     {
         public override string Name => "Perfect";
         public override string Acronym => "PF";
-        public override IconUsage Icon => OsuIcon.ModPerfect;
+        public override IconUsage? Icon => OsuIcon.ModPerfect;
         public override string Description => "SS or quit.";
 
         protected override bool FailCondition(HealthProcessor healthProcessor, JudgementResult result) => result.Type != result.Judgement.MaxResult;

osu.Game/Rulesets/Mods/ModRelax.cs

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

osu.Game/Rulesets/Mods/ModSuddenDeath.cs

@@ -13,7 +13,7 @@ namespace osu.Game.Rulesets.Mods
     {
         public override string Name => "Sudden Death";
         public override string Acronym => "SD";
-        public override IconUsage Icon => OsuIcon.ModSuddendeath;
+        public override IconUsage? Icon => OsuIcon.ModSuddendeath;
         public override ModType Type => ModType.DifficultyIncrease;
         public override string Description => "Miss and fail.";
         public override double ScoreMultiplier => 1;

osu.Game/Rulesets/Mods/ModWindDown.cs

@@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Mods
         public override string Name => "Wind Down";
         public override string Acronym => "WD";
         public override string Description => "Sloooow doooown...";
-        public override IconUsage Icon => FontAwesome.Solid.ChevronCircleDown;
+        public override IconUsage? Icon => FontAwesome.Solid.ChevronCircleDown;
         public override double ScoreMultiplier => 1.0;
 
         [SettingSource("Final rate", "The speed increase to ramp towards")]

osu.Game/Rulesets/Mods/ModWindUp.cs

@@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Mods
         public override string Name => "Wind Up";
         public override string Acronym => "WU";
         public override string Description => "Can you keep up?";
-        public override IconUsage Icon => FontAwesome.Solid.ChevronCircleUp;
+        public override IconUsage? Icon => FontAwesome.Solid.ChevronCircleUp;
         public override double ScoreMultiplier => 1.0;
 
         [SettingSource("Final rate", "The speed increase to ramp towards")]

osu.Game/Rulesets/UI/ModIcon.cs

@@ -9,6 +9,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets.Mods;
 using osuTK;
 using osu.Framework.Bindables;
@@ -20,25 +21,30 @@ namespace osu.Game.Rulesets.UI
         public readonly BindableBool Selected = new BindableBool();
 
         private readonly SpriteIcon modIcon;
+        private readonly SpriteText modAcronym;
         private readonly SpriteIcon background;
 
         private const float size = 80;
 
-        public IconUsage Icon
-        {
-            get => modIcon.Icon;
-            set => modIcon.Icon = value;
-        }
-
         private readonly ModType type;
 
         public virtual string TooltipText { get; }
 
-        protected Mod Mod { get; private set; }
+        private Mod mod;
+
+        public Mod Mod
+        {
+            get => mod;
+            set
+            {
+                mod = value;
+                updateMod(value);
+            }
+        }
 
         public ModIcon(Mod mod)
         {
-            Mod = mod ?? throw new ArgumentNullException(nameof(mod));
+            this.mod = mod ?? throw new ArgumentNullException(nameof(mod));
 
             type = mod.Type;
 
@@ -56,15 +62,43 @@ namespace osu.Game.Rulesets.UI
                     Icon = OsuIcon.ModBg,
                     Shadow = true,
                 },
+                modAcronym = new OsuSpriteText
+                {
+                    Origin = Anchor.Centre,
+                    Anchor = Anchor.Centre,
+                    Colour = OsuColour.Gray(84),
+                    Alpha = 0,
+                    Font = OsuFont.Numeric.With(null, 22f),
+                    UseFullGlyphHeight = false,
+                    Text = mod.Acronym
+                },
                 modIcon = new SpriteIcon
                 {
                     Origin = Anchor.Centre,
                     Anchor = Anchor.Centre,
                     Colour = OsuColour.Gray(84),
-                    Size = new Vector2(size - 35),
-                    Icon = mod.Icon
+                    Size = new Vector2(45),
+                    Icon = FontAwesome.Solid.Question
                 },
             };
+
+            updateMod(mod);
+        }
+
+        private void updateMod(Mod value)
+        {
+            modAcronym.Text = value.Acronym;
+            modIcon.Icon = value.Icon ?? FontAwesome.Solid.Question;
+
+            if (value.Icon is null)
+            {
+                modIcon.FadeOut();
+                modAcronym.FadeIn();
+                return;
+            }
+
+            modIcon.FadeIn();
+            modAcronym.FadeOut();
         }
 
         private Color4 backgroundColour;

osu.Game/Screens/Edit/Editor.cs

@@ -44,6 +44,9 @@ namespace osu.Game.Screens.Edit
 
         public override bool DisallowExternalBeatmapRulesetChanges => true;
 
+        [Resolved]
+        private BeatmapManager beatmapManager { get; set; }
+
         private Box bottomBackground;
         private Container screenContainer;
 
@@ -56,7 +59,6 @@ namespace osu.Game.Screens.Edit
         private EditorBeatmap editorBeatmap;
 
         private DependencyContainer dependencies;
-        private GameHost host;
 
         protected override UserActivity InitialActivity => new UserActivity.Editing(Beatmap.Value.BeatmapInfo);
 
@@ -66,8 +68,6 @@ namespace osu.Game.Screens.Edit
         [BackgroundDependencyLoader]
         private void load(OsuColour colours, GameHost host)
         {
-            this.host = host;
-
             beatDivisor.Value = Beatmap.Value.BeatmapInfo.BeatDivisor;
             beatDivisor.BindValueChanged(divisor => Beatmap.Value.BeatmapInfo.BeatDivisor = divisor.NewValue);
 
@@ -90,7 +90,8 @@ namespace osu.Game.Screens.Edit
 
             if (RuntimeInfo.IsDesktop)
             {
-                fileMenuItems.Add(new EditorMenuItem("Export", MenuItemType.Standard, exportBeatmap));
+                fileMenuItems.Add(new EditorMenuItem("Save", MenuItemType.Standard, saveBeatmap));
+                fileMenuItems.Add(new EditorMenuItem("Export package", MenuItemType.Standard, exportBeatmap));
                 fileMenuItems.Add(new EditorMenuItemSpacer());
             }
 
@@ -205,6 +206,15 @@ namespace osu.Game.Screens.Edit
                 case Key.Right:
                     seek(e, 1);
                     return true;
+
+                case Key.S:
+                    if (e.ControlPressed)
+                    {
+                        saveBeatmap();
+                        return true;
+                    }
+
+                    break;
             }
 
             return base.OnKeyDown(e);
@@ -292,8 +302,6 @@ namespace osu.Game.Screens.Edit
             }
         }
 
-        private void exportBeatmap() => host.OpenFileExternally(Beatmap.Value.Save());
-
         private void onModeChanged(ValueChangedEvent<EditorScreenMode> e)
         {
             currentScreen?.Exit();
@@ -329,5 +337,13 @@ namespace osu.Game.Screens.Edit
             else
                 clock.SeekForward(!clock.IsRunning, amount);
         }
+
+        private void saveBeatmap() => beatmapManager.Save(playableBeatmap.BeatmapInfo, editorBeatmap);
+
+        private void exportBeatmap()
+        {
+            saveBeatmap();
+            beatmapManager.Export(Beatmap.Value.BeatmapSetInfo);
+        }
     }
 }

osu.Game/Screens/Ranking/Pages/ReplayDownloadButton.cs

@@ -74,15 +74,15 @@ namespace osu.Game.Screens.Ranking.Pages
                 switch (replayAvailability)
                 {
                     case ReplayAvailability.Local:
-                        button.TooltipText = @"Watch replay";
+                        button.TooltipText = @"watch replay";
                         break;
 
                     case ReplayAvailability.Online:
-                        button.TooltipText = @"Download replay";
+                        button.TooltipText = @"download replay";
                         break;
 
                     default:
-                        button.TooltipText = @"Replay unavailable";
+                        button.TooltipText = @"replay unavailable";
                         break;
                 }
             }, true);

osu.Game/Screens/Ranking/Pages/RetryButton.cs

@@ -39,7 +39,7 @@ namespace osu.Game.Screens.Ranking.Pages
                 },
             };
 
-            TooltipText = "Retry";
+            TooltipText = "retry";
         }
 
         [BackgroundDependencyLoader]

osu.Game/Screens/Select/BeatmapCarousel.cs

@@ -412,6 +412,12 @@ namespace osu.Game.Screens.Select
 
         protected override bool OnKeyDown(KeyDownEvent e)
         {
+            // allow for controlling volume when alt is held.
+            // this is required as the VolumeControlReceptor uses OnPressed, which is
+            // executed after all OnKeyDown events.
+            if (e.AltPressed)
+                return base.OnKeyDown(e);
+
             int direction = 0;
             bool skipDifficulties = false;
 

osu.Game/Screens/Select/Details/AdvancedStats.cs

@@ -10,7 +10,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
-using System;
 using osu.Game.Beatmaps;
 using osu.Framework.Bindables;
 using System.Collections.Generic;
@@ -118,17 +117,9 @@ namespace osu.Game.Screens.Select.Details
                     mod.ApplyToDifficulty(adjustedDifficulty);
             }
 
-            //mania specific
-            if ((Beatmap?.Ruleset?.ID ?? 0) == 3)
-            {
-                firstValue.Title = "Key Amount";
-                firstValue.Value = ((int)MathF.Round(baseDifficulty?.CircleSize ?? 0), (int)MathF.Round(adjustedDifficulty?.CircleSize ?? 0));
-            }
-            else
-            {
-                firstValue.Title = "Circle Size";
-                firstValue.Value = (baseDifficulty?.CircleSize ?? 0, adjustedDifficulty?.CircleSize);
-            }
+            // Account for mania differences
+            firstValue.Title = (Beatmap?.Ruleset?.ID ?? 0) == 3 ? "Key Amount" : "Circle Size";
+            firstValue.Value = (baseDifficulty?.CircleSize ?? 0, adjustedDifficulty?.CircleSize);
 
             starDifficulty.Value = ((float)(Beatmap?.StarDifficulty ?? 0), null);
 

osu.Game/Updater/SimpleUpdateManager.cs

@@ -7,8 +7,8 @@ using Newtonsoft.Json;
 using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.IO.Network;
 using osu.Framework.Platform;
+using osu.Game.Online.API;
 using osu.Game.Overlays.Notifications;
 
 namespace osu.Game.Updater
@@ -36,7 +36,7 @@ namespace osu.Game.Updater
         {
             try
             {
-                var releases = new JsonWebRequest<GitHubRelease>("https://api.github.com/repos/ppy/osu/releases/latest");
+                var releases = new OsuJsonWebRequest<GitHubRelease>("https://api.github.com/repos/ppy/osu/releases/latest");
 
                 await releases.PerformAsync();
 

osu.Game/Users/Drawables/DrawableAvatar.cs

@@ -74,7 +74,7 @@ namespace osu.Game.Users.Drawables
 
         private class ClickableArea : OsuClickableContainer
         {
-            public override string TooltipText => Enabled.Value ? @"View Profile" : null;
+            public override string TooltipText => Enabled.Value ? @"view profile" : null;
 
             protected override bool OnClick(ClickEvent e)
             {

osu.Game/osu.Game.csproj

@@ -23,7 +23,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2019.1230.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.111.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.118.0" />
     <PackageReference Include="Sentry" Version="1.2.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />

osu.iOS.props

@@ -74,7 +74,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="ppy.osu.Game.Resources" Version="2019.1230.0" />
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.111.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.118.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
   <ItemGroup Label="Transitive Dependencies">
@@ -82,7 +82,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.111.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.118.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

osu.sln

@@ -65,6 +65,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		osu.TestProject.props = osu.TestProject.props
 	EndProjectSection
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "osu.Game.Benchmarks", "osu.Game.Benchmarks\osu.Game.Benchmarks.csproj", "{93632F2D-2BB4-46C1-A7B8-F8CF2FB27118}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -399,6 +401,18 @@ Global
 		{5CC222DC-5716-4499-B897-DCBDDA4A5CF9}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{5CC222DC-5716-4499-B897-DCBDDA4A5CF9}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
 		{5CC222DC-5716-4499-B897-DCBDDA4A5CF9}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU
+		{93632F2D-2BB4-46C1-A7B8-F8CF2FB27118}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{93632F2D-2BB4-46C1-A7B8-F8CF2FB27118}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{93632F2D-2BB4-46C1-A7B8-F8CF2FB27118}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{93632F2D-2BB4-46C1-A7B8-F8CF2FB27118}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{93632F2D-2BB4-46C1-A7B8-F8CF2FB27118}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{93632F2D-2BB4-46C1-A7B8-F8CF2FB27118}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{93632F2D-2BB4-46C1-A7B8-F8CF2FB27118}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{93632F2D-2BB4-46C1-A7B8-F8CF2FB27118}.Release|Any CPU.Build.0 = Release|Any CPU
+		{93632F2D-2BB4-46C1-A7B8-F8CF2FB27118}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{93632F2D-2BB4-46C1-A7B8-F8CF2FB27118}.Release|iPhone.Build.0 = Release|Any CPU
+		{93632F2D-2BB4-46C1-A7B8-F8CF2FB27118}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{93632F2D-2BB4-46C1-A7B8-F8CF2FB27118}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE