Merge pull request #8802 from LittleEndu/always-combo-break

Allow user to always play first combo break sound regardless of lost combo count

osu.Android.props

@@ -51,7 +51,7 @@
     <Reference Include="Java.Interop" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.622.1" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.707.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.714.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.714.1" />
   </ItemGroup>
 </Project>

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

@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
     <PackageReference Include="nunit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
   </ItemGroup>
 
   <ItemGroup>

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

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

osu.Game.Rulesets.Catch/CatchRuleset.cs

@@ -21,11 +21,13 @@ using osu.Game.Rulesets.Difficulty;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using System;
+using osu.Framework.Testing;
 using osu.Game.Rulesets.Catch.Skinning;
 using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Catch
 {
+    [ExcludeFromDynamicCompile]
     public class CatchRuleset : Ruleset, ILegacyRuleset
     {
         public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod> mods = null) => new DrawableCatchRuleset(this, beatmap, mods);

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

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

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

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

osu.Game.Rulesets.Mania/ManiaRuleset.cs

@@ -12,6 +12,7 @@ using System.Linq;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Bindings;
+using osu.Framework.Testing;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Mania.Replays;
 using osu.Game.Rulesets.Replays.Types;
@@ -34,6 +35,7 @@ using osu.Game.Screens.Ranking.Statistics;
 
 namespace osu.Game.Rulesets.Mania
 {
+    [ExcludeFromDynamicCompile]
     public class ManiaRuleset : Ruleset, ILegacyRuleset
     {
         /// <summary>

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

@@ -2,9 +2,12 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Pooling;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
@@ -16,14 +19,46 @@ namespace osu.Game.Rulesets.Osu.Tests
     {
         public TestSceneDrawableJudgement()
         {
+            var pools = new List<DrawablePool<DrawableOsuJudgement>>();
+
             foreach (HitResult result in Enum.GetValues(typeof(HitResult)).OfType<HitResult>().Skip(1))
             {
-                AddStep("Show " + result.GetDescription(), () => SetContents(() =>
-                    new DrawableOsuJudgement(new JudgementResult(new HitObject(), new Judgement()) { Type = result }, null)
+                AddStep("Show " + result.GetDescription(), () =>
+                {
+                    int poolIndex = 0;
+
+                    SetContents(() =>
                     {
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                    }));
+                        DrawablePool<DrawableOsuJudgement> pool;
+
+                        if (poolIndex >= pools.Count)
+                            pools.Add(pool = new DrawablePool<DrawableOsuJudgement>(1));
+                        else
+                        {
+                            pool = pools[poolIndex];
+
+                            // We need to make sure neither the pool nor the judgement get disposed when new content is set, and they both share the same parent.
+                            ((Container)pool.Parent).Clear(false);
+                        }
+
+                        var container = new Container
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Children = new Drawable[]
+                            {
+                                pool,
+                                pool.Get(j => j.Apply(new JudgementResult(new HitObject(), new Judgement()) { Type = result }, null)).With(j =>
+                                {
+                                    j.Anchor = Anchor.Centre;
+                                    j.Origin = Anchor.Centre;
+                                })
+                            }
+                        };
+
+                        poolIndex++;
+                        return container;
+                    });
+                });
             }
         }
     }

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

@@ -5,7 +5,9 @@ using System;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Shapes;
 using osu.Framework.Testing.Input;
+using osu.Framework.Utils;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Osu.UI.Cursor;
 using osu.Game.Screens.Play;
@@ -24,9 +26,34 @@ namespace osu.Game.Rulesets.Osu.Tests
         [Resolved]
         private OsuConfigManager config { get; set; }
 
+        private Drawable background;
+
         public TestSceneGameplayCursor()
         {
             gameplayBeatmap = new GameplayBeatmap(CreateBeatmap(new OsuRuleset().RulesetInfo));
+
+            AddStep("change background colour", () =>
+            {
+                background?.Expire();
+
+                Add(background = new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Depth = float.MaxValue,
+                    Colour = new Colour4(RNG.NextSingle(), RNG.NextSingle(), RNG.NextSingle(), 1)
+                });
+            });
+
+            AddSliderStep("circle size", 0f, 10f, 0f, val =>
+            {
+                config.Set(OsuSetting.AutoCursorSize, true);
+                gameplayBeatmap.BeatmapInfo.BaseDifficulty.CircleSize = val;
+                Scheduler.AddOnce(recreate);
+            });
+
+            AddStep("test cursor container", recreate);
+
+            void recreate() => SetContents(() => new OsuInputManager(new OsuRuleset().RulesetInfo) { Child = new OsuCursorContainer() });
         }
 
         [TestCase(1, 1)]
@@ -69,16 +96,27 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private class ClickingCursorContainer : OsuCursorContainer
         {
+            private bool pressed;
+
+            public bool Pressed
+            {
+                set
+                {
+                    if (value == pressed)
+                        return;
+
+                    pressed = value;
+                    if (value)
+                        OnPressed(OsuAction.LeftButton);
+                    else
+                        OnReleased(OsuAction.LeftButton);
+                }
+            }
+
             protected override void Update()
             {
                 base.Update();
-
-                double currentTime = Time.Current;
-
-                if (((int)(currentTime / 1000)) % 2 == 0)
-                    OnPressed(OsuAction.LeftButton);
-                else
-                    OnReleased(OsuAction.LeftButton);
+                Pressed = ((int)(Time.Current / 1000)) % 2 == 0;
             }
         }
 
@@ -87,6 +125,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             public MovingCursorInputManager()
             {
                 UseParentInput = false;
+                ShowVisualCursorGuide = false;
             }
 
             protected override void Update()

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

@@ -67,7 +67,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 if (auto && !userTriggered && Time.Current > Spinner.StartTime + Spinner.Duration / 2 && Progress < 1)
                 {
                     // force completion only once to not break human interaction
-                    Disc.RotationAbsolute = Spinner.SpinsRequired * 360;
+                    Disc.CumulativeRotation = Spinner.SpinsRequired * 360;
                     auto = false;
                 }
 

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

@@ -14,6 +14,12 @@ using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osuTK;
 using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Replays;
+using osu.Game.Rulesets.Osu.Replays;
+using osu.Game.Rulesets.Osu.UI;
+using osu.Game.Rulesets.Replays;
+using osu.Game.Scoring;
 using osu.Game.Storyboards;
 using static osu.Game.Tests.Visual.OsuTestScene.ClockBackedTestWorkingBeatmap;
 
@@ -36,6 +42,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         }
 
         private DrawableSpinner drawableSpinner;
+        private SpriteIcon spinnerSymbol => drawableSpinner.ChildrenOfType<SpriteIcon>().Single();
 
         [SetUpSteps]
         public override void SetUpSteps()
@@ -50,25 +57,78 @@ namespace osu.Game.Rulesets.Osu.Tests
         public void TestSpinnerRewindingRotation()
         {
             addSeekStep(5000);
-            AddAssert("is rotation absolute not almost 0", () => !Precision.AlmostEquals(drawableSpinner.Disc.RotationAbsolute, 0, 100));
+            AddAssert("is disc rotation not almost 0", () => !Precision.AlmostEquals(drawableSpinner.Disc.Rotation, 0, 100));
+            AddAssert("is disc rotation absolute not almost 0", () => !Precision.AlmostEquals(drawableSpinner.Disc.CumulativeRotation, 0, 100));
 
             addSeekStep(0);
-            AddAssert("is rotation absolute almost 0", () => Precision.AlmostEquals(drawableSpinner.Disc.RotationAbsolute, 0, 100));
+            AddAssert("is disc rotation almost 0", () => Precision.AlmostEquals(drawableSpinner.Disc.Rotation, 0, 100));
+            AddAssert("is disc rotation absolute almost 0", () => Precision.AlmostEquals(drawableSpinner.Disc.CumulativeRotation, 0, 100));
         }
 
         [Test]
         public void TestSpinnerMiddleRewindingRotation()
         {
-            double estimatedRotation = 0;
+            double finalAbsoluteDiscRotation = 0, finalRelativeDiscRotation = 0, finalSpinnerSymbolRotation = 0;
 
             addSeekStep(5000);
-            AddStep("retrieve rotation", () => estimatedRotation = drawableSpinner.Disc.RotationAbsolute);
+            AddStep("retrieve disc relative rotation", () => finalRelativeDiscRotation = drawableSpinner.Disc.Rotation);
+            AddStep("retrieve disc absolute rotation", () => finalAbsoluteDiscRotation = drawableSpinner.Disc.CumulativeRotation);
+            AddStep("retrieve spinner symbol rotation", () => finalSpinnerSymbolRotation = spinnerSymbol.Rotation);
 
             addSeekStep(2500);
+            AddUntilStep("disc rotation rewound",
+                // we want to make sure that the rotation at time 2500 is in the same direction as at time 5000, but about half-way in.
+                () => Precision.AlmostEquals(drawableSpinner.Disc.Rotation, finalRelativeDiscRotation / 2, 100));
+            AddUntilStep("symbol rotation rewound",
+                () => Precision.AlmostEquals(spinnerSymbol.Rotation, finalSpinnerSymbolRotation / 2, 100));
+
             addSeekStep(5000);
-            AddAssert("is rotation absolute almost same", () => Precision.AlmostEquals(drawableSpinner.Disc.RotationAbsolute, estimatedRotation, 100));
+            AddAssert("is disc rotation almost same",
+                () => Precision.AlmostEquals(drawableSpinner.Disc.Rotation, finalRelativeDiscRotation, 100));
+            AddAssert("is symbol rotation almost same",
+                () => Precision.AlmostEquals(spinnerSymbol.Rotation, finalSpinnerSymbolRotation, 100));
+            AddAssert("is disc rotation absolute almost same",
+                () => Precision.AlmostEquals(drawableSpinner.Disc.CumulativeRotation, finalAbsoluteDiscRotation, 100));
         }
 
+        [Test]
+        public void TestRotationDirection([Values(true, false)] bool clockwise)
+        {
+            if (clockwise)
+            {
+                AddStep("flip replay", () =>
+                {
+                    var drawableRuleset = this.ChildrenOfType<DrawableOsuRuleset>().Single();
+                    var score = drawableRuleset.ReplayScore;
+                    var scoreWithFlippedReplay = new Score
+                    {
+                        ScoreInfo = score.ScoreInfo,
+                        Replay = flipReplay(score.Replay)
+                    };
+                    drawableRuleset.SetReplayScore(scoreWithFlippedReplay);
+                });
+            }
+
+            addSeekStep(5000);
+
+            AddAssert("disc spin direction correct", () => clockwise ? drawableSpinner.Disc.Rotation > 0 : drawableSpinner.Disc.Rotation < 0);
+            AddAssert("spinner symbol direction correct", () => clockwise ? spinnerSymbol.Rotation > 0 : spinnerSymbol.Rotation < 0);
+        }
+
+        private Replay flipReplay(Replay scoreReplay) => new Replay
+        {
+            Frames = scoreReplay
+                     .Frames
+                     .Cast<OsuReplayFrame>()
+                     .Select(replayFrame =>
+                     {
+                         var flippedPosition = new Vector2(OsuPlayfield.BASE_SIZE.X - replayFrame.Position.X, replayFrame.Position.Y);
+                         return new OsuReplayFrame(replayFrame.Time, flippedPosition, replayFrame.Actions.ToArray());
+                     })
+                     .Cast<ReplayFrame>()
+                     .ToList()
+        };
+
         [Test]
         public void TestSpinPerMinuteOnRewind()
         {

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

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

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

@@ -15,7 +15,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         public BindableNumber<float> CircleSize { get; } = new BindableFloat
         {
             Precision = 0.1f,
-            MinValue = 1,
+            MinValue = 0,
             MaxValue = 10,
             Default = 5,
             Value = 5,
@@ -25,7 +25,7 @@ namespace osu.Game.Rulesets.Osu.Mods
         public BindableNumber<float> ApproachRate { get; } = new BindableFloat
         {
             Precision = 0.1f,
-            MinValue = 1,
+            MinValue = 0,
             MaxValue = 10,
             Default = 5,
             Value = 5,

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

@@ -24,10 +24,14 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
         }
 
+        public DrawableOsuJudgement()
+        {
+        }
+
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config)
         {
-            if (config.Get<bool>(OsuSetting.HitLighting) && Result.Type != HitResult.Miss)
+            if (config.Get<bool>(OsuSetting.HitLighting))
             {
                 AddInternal(lighting = new SkinnableSprite("lighting")
                 {
@@ -36,11 +40,34 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     Blending = BlendingParameters.Additive,
                     Depth = float.MaxValue
                 });
+            }
+        }
+
+        public override void Apply(JudgementResult result, DrawableHitObject judgedObject)
+        {
+            base.Apply(result, judgedObject);
+
+            if (judgedObject?.HitObject is OsuHitObject osuObject)
+            {
+                Position = osuObject.StackedPosition;
+                Scale = new Vector2(osuObject.Scale);
+            }
+        }
+
+        protected override void PrepareForUse()
+        {
+            base.PrepareForUse();
+
+            lightingColour?.UnbindAll();
+
+            if (lighting != null)
+            {
+                lighting.ResetAnimation();
 
                 if (JudgedObject != null)
                 {
                     lightingColour = JudgedObject.AccentColour.GetBoundCopy();
-                    lightingColour.BindValueChanged(colour => lighting.Colour = colour.NewValue, true);
+                    lightingColour.BindValueChanged(colour => lighting.Colour = Result.Type == HitResult.Miss ? Color4.Transparent : colour.NewValue, true);
                 }
                 else
                 {
@@ -55,13 +82,13 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         {
             if (lighting != null)
             {
-                JudgementBody.Delay(FadeInDuration).FadeOut(400);
+                JudgementBody.FadeIn().Delay(FadeInDuration).FadeOut(400);
 
                 lighting.ScaleTo(0.8f).ScaleTo(1.2f, 600, Easing.Out);
                 lighting.FadeIn(200).Then().Delay(200).FadeOut(1000);
             }
 
-            JudgementText?.TransformSpacingTo(new Vector2(14, 0), 1800, Easing.OutQuint);
+            JudgementText?.TransformSpacingTo(Vector2.Zero).Then().TransformSpacingTo(new Vector2(14, 0), 1800, Easing.OutQuint);
             base.ApplyHitAnimations();
         }
     }

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

@@ -138,7 +138,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             positionBindable.BindTo(HitObject.PositionBindable);
         }
 
-        public float Progress => Math.Clamp(Disc.RotationAbsolute / 360 / Spinner.SpinsRequired, 0, 1);
+        public float Progress => Math.Clamp(Disc.CumulativeRotation / 360 / Spinner.SpinsRequired, 0, 1);
 
         protected override void CheckForResult(bool userTriggered, double timeOffset)
         {
@@ -191,13 +191,13 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
             circle.Rotation = Disc.Rotation;
             Ticks.Rotation = Disc.Rotation;
-            SpmCounter.SetRotation(Disc.RotationAbsolute);
+            SpmCounter.SetRotation(Disc.CumulativeRotation);
 
             float relativeCircleScale = Spinner.Scale * circle.DrawHeight / mainContainer.DrawHeight;
             float targetScale = relativeCircleScale + (1 - relativeCircleScale) * Progress;
             Disc.Scale = new Vector2((float)Interpolation.Lerp(Disc.Scale.X, targetScale, Math.Clamp(Math.Abs(Time.Elapsed) / 100, 0, 1)));
 
-            symbol.Rotation = (float)Interpolation.Lerp(symbol.Rotation, Disc.RotationAbsolute / 2, Math.Clamp(Math.Abs(Time.Elapsed) / 40, 0, 1));
+            symbol.Rotation = (float)Interpolation.Lerp(symbol.Rotation, Disc.Rotation / 2, Math.Clamp(Math.Abs(Time.Elapsed) / 40, 0, 1));
         }
 
         protected override void UpdateInitialTransforms()
@@ -207,9 +207,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             circleContainer.ScaleTo(Spinner.Scale * 0.3f);
             circleContainer.ScaleTo(Spinner.Scale, HitObject.TimePreempt / 1.4f, Easing.OutQuint);
 
-            Disc.RotateTo(-720);
-            symbol.RotateTo(-720);
-
             mainContainer
                 .ScaleTo(0)
                 .ScaleTo(Spinner.Scale * circle.DrawHeight / DrawHeight * 1.4f, HitObject.TimePreempt - 150, Easing.OutQuint)

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

@@ -73,6 +73,19 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
             }
         }
 
+        /// <summary>
+        /// The total rotation performed on the spinner disc, disregarding the spin direction.
+        /// </summary>
+        /// <remarks>
+        /// This value is always non-negative and is monotonically increasing with time
+        /// (i.e. will only increase if time is passing forward, but can decrease during rewind).
+        /// </remarks>
+        /// <example>
+        /// If the spinner is spun 360 degrees clockwise and then 360 degrees counter-clockwise,
+        /// this property will return the value of 720 (as opposed to 0 for <see cref="Drawable.Rotation"/>).
+        /// </example>
+        public float CumulativeRotation;
+
         /// <summary>
         /// Whether currently in the correct time range to allow spinning.
         /// </summary>
@@ -88,10 +101,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 
         private float lastAngle;
         private float currentRotation;
-        public float RotationAbsolute;
         private int completeTick;
 
-        private bool updateCompleteTick() => completeTick != (completeTick = (int)(RotationAbsolute / 360));
+        private bool updateCompleteTick() => completeTick != (completeTick = (int)(CumulativeRotation / 360));
 
         private bool rotationTransferred;
 
@@ -149,7 +161,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
             }
 
             currentRotation += angle;
-            RotationAbsolute += Math.Abs(angle) * Math.Sign(Clock.ElapsedFrameTime);
+            CumulativeRotation += Math.Abs(angle) * Math.Sign(Clock.ElapsedFrameTime);
         }
     }
 }

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

@@ -4,6 +4,7 @@
 using osu.Framework.Bindables;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Osu.Objects
@@ -24,6 +25,13 @@ namespace osu.Game.Rulesets.Osu.Objects
 
         protected override HitWindows CreateHitWindows() => HitWindows.Empty;
 
-        public override Judgement CreateJudgement() => new SliderRepeat.SliderRepeatJudgement();
+        public override Judgement CreateJudgement() => new SliderTailJudgement();
+
+        public class SliderTailJudgement : OsuJudgement
+        {
+            protected override int NumericResultFor(HitResult result) => 0;
+
+            public override bool AffectsCombo => false;
+        }
     }
 }

osu.Game.Rulesets.Osu/OsuRuleset.cs

@@ -30,12 +30,14 @@ using osu.Game.Scoring;
 using osu.Game.Skinning;
 using System;
 using System.Linq;
+using osu.Framework.Testing;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Statistics;
 using osu.Game.Screens.Ranking.Statistics;
 
 namespace osu.Game.Rulesets.Osu
 {
+    [ExcludeFromDynamicCompile]
     public class OsuRuleset : Ruleset, ILegacyRuleset
     {
         public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod> mods = null) => new DrawableOsuRuleset(this, beatmap, mods);

osu.Game.Rulesets.Osu/UI/Cursor/OsuCursor.cs

@@ -59,10 +59,10 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
         {
             if (!cursorExpand) return;
 
-            expandTarget.ScaleTo(released_scale).ScaleTo(pressed_scale, 100, Easing.OutQuad);
+            expandTarget.ScaleTo(released_scale).ScaleTo(pressed_scale, 400, Easing.OutElasticHalf);
         }
 
-        public void Contract() => expandTarget.ScaleTo(released_scale, 100, Easing.OutQuad);
+        public void Contract() => expandTarget.ScaleTo(released_scale, 400, Easing.OutQuad);
 
         private class DefaultCursor : OsuCursorSprite
         {
@@ -115,24 +115,22 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
                                     },
                                 },
                             },
-                            new CircularContainer
-                            {
-                                Origin = Anchor.Centre,
-                                Anchor = Anchor.Centre,
-                                RelativeSizeAxes = Axes.Both,
-                                Scale = new Vector2(0.1f),
-                                Masking = true,
-                                Children = new Drawable[]
-                                {
-                                    new Box
-                                    {
-                                        RelativeSizeAxes = Axes.Both,
-                                        Colour = Color4.White,
-                                    },
-                                },
-                            },
-                        }
-                    }
+                        },
+                    },
+                    new Circle
+                    {
+                        Origin = Anchor.Centre,
+                        Anchor = Anchor.Centre,
+                        RelativeSizeAxes = Axes.Both,
+                        Scale = new Vector2(0.14f),
+                        Colour = new Color4(34, 93, 204, 255),
+                        EdgeEffect = new EdgeEffectParameters
+                        {
+                            Type = EdgeEffectType.Glow,
+                            Radius = 8,
+                            Colour = Color4.White,
+                        },
+                    },
                 };
             }
         }

osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs

@@ -30,7 +30,9 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
 
         private readonly Drawable cursorTrail;
 
-        public Bindable<float> CursorScale = new BindableFloat(1);
+        public IBindable<float> CursorScale => cursorScale;
+
+        private readonly Bindable<float> cursorScale = new BindableFloat(1);
 
         private Bindable<float> userCursorScale;
         private Bindable<bool> autoCursorScale;
@@ -68,13 +70,13 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
             autoCursorScale = config.GetBindable<bool>(OsuSetting.AutoCursorSize);
             autoCursorScale.ValueChanged += _ => calculateScale();
 
-            CursorScale.ValueChanged += e =>
+            CursorScale.BindValueChanged(e =>
             {
                 var newScale = new Vector2(e.NewValue);
 
                 ActiveCursor.Scale = newScale;
                 cursorTrail.Scale = newScale;
-            };
+            }, true);
 
             calculateScale();
         }
@@ -95,7 +97,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
                 scale *= GetScaleForCircleSize(beatmap.BeatmapInfo.BaseDifficulty.CircleSize);
             }
 
-            CursorScale.Value = scale;
+            cursorScale.Value = scale;
 
             var newScale = new Vector2(scale);
 

osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs

@@ -1,17 +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 osuTK;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Pooling;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
-using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects.Drawables.Connections;
-using osu.Game.Rulesets.UI;
-using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Osu.Scoring;
 using osu.Game.Rulesets.Osu.UI.Cursor;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.UI;
 using osu.Game.Skinning;
+using osuTK;
 
 namespace osu.Game.Rulesets.Osu.UI
 {
@@ -26,6 +32,8 @@ namespace osu.Game.Rulesets.Osu.UI
 
         protected override GameplayCursorContainer CreateCursor() => new OsuCursorContainer();
 
+        private readonly IDictionary<HitResult, DrawablePool<DrawableOsuJudgement>> poolDictionary = new Dictionary<HitResult, DrawablePool<DrawableOsuJudgement>>();
+
         public OsuPlayfield()
         {
             InternalChildren = new Drawable[]
@@ -54,6 +62,13 @@ namespace osu.Game.Rulesets.Osu.UI
             };
 
             hitPolicy = new OrderedHitPolicy(HitObjectContainer);
+
+            var hitWindows = new OsuHitWindows();
+
+            foreach (var result in Enum.GetValues(typeof(HitResult)).OfType<HitResult>().Where(r => r > HitResult.None && hitWindows.IsHitResultAllowed(r)))
+                poolDictionary.Add(result, new DrawableJudgementPool(result));
+
+            AddRangeInternal(poolDictionary.Values);
         }
 
         public override void Add(DrawableHitObject h)
@@ -91,12 +106,7 @@ namespace osu.Game.Rulesets.Osu.UI
             if (!judgedObject.DisplayResult || !DisplayJudgements.Value)
                 return;
 
-            DrawableOsuJudgement explosion = new DrawableOsuJudgement(result, judgedObject)
-            {
-                Origin = Anchor.Centre,
-                Position = ((OsuHitObject)judgedObject.HitObject).StackedEndPosition,
-                Scale = new Vector2(((OsuHitObject)judgedObject.HitObject).Scale)
-            };
+            DrawableOsuJudgement explosion = poolDictionary[result.Type].Get(doj => doj.Apply(result, judgedObject));
 
             judgementLayer.Add(explosion);
         }
@@ -107,5 +117,26 @@ namespace osu.Game.Rulesets.Osu.UI
         {
             public void Add(Drawable approachCircleProxy) => AddInternal(approachCircleProxy);
         }
+
+        private class DrawableJudgementPool : DrawablePool<DrawableOsuJudgement>
+        {
+            private readonly HitResult result;
+
+            public DrawableJudgementPool(HitResult result)
+                : base(10)
+            {
+                this.result = result;
+            }
+
+            protected override DrawableOsuJudgement CreateNewDrawable()
+            {
+                var judgement = base.CreateNewDrawable();
+
+                // just a placeholder to initialise the correct drawable hierarchy for this pool.
+                judgement.Apply(new JudgementResult(new HitObject(), new Judgement()) { Type = result }, null);
+
+                return judgement;
+            }
+        }
     }
 }

osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs

@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Osu.UI
         private OsuClickToResumeCursor clickToResumeCursor;
 
         private OsuCursorContainer localCursorContainer;
-        private Bindable<float> localCursorScale;
+        private IBindable<float> localCursorScale;
 
         public override CursorContainer LocalCursor => State.Value == Visibility.Visible ? localCursorContainer : null;
 

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

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

osu.Game.Rulesets.Taiko/TaikoRuleset.cs

@@ -22,6 +22,7 @@ using osu.Game.Rulesets.Taiko.Scoring;
 using osu.Game.Scoring;
 using System;
 using System.Linq;
+using osu.Framework.Testing;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Taiko.Edit;
 using osu.Game.Rulesets.Taiko.Objects;
@@ -31,6 +32,7 @@ using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Taiko
 {
+    [ExcludeFromDynamicCompile]
     public class TaikoRuleset : Ruleset, ILegacyRuleset
     {
         public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod> mods = null) => new DrawableTaikoRuleset(this, beatmap, mods);

osu.Game.Tests/Gameplay/TestSceneDrainingHealthProcessor.cs

@@ -157,6 +157,24 @@ namespace osu.Game.Tests.Gameplay
             assertHealthNotEqualTo(1);
         }
 
+        [Test]
+        public void TestBonusObjectsExcludedFromDrain()
+        {
+            var beatmap = new Beatmap
+            {
+                BeatmapInfo = { BaseDifficulty = { DrainRate = 10 } },
+            };
+
+            beatmap.HitObjects.Add(new JudgeableHitObject { StartTime = 0 });
+            for (double time = 0; time < 5000; time += 100)
+                beatmap.HitObjects.Add(new JudgeableHitObject(false) { StartTime = time });
+            beatmap.HitObjects.Add(new JudgeableHitObject { StartTime = 5000 });
+
+            createProcessor(beatmap);
+            setTime(4900); // Get close to the second combo-affecting object
+            assertHealthNotEqualTo(0);
+        }
+
         private Beatmap createBeatmap(double startTime, double endTime, params BreakPeriod[] breaks)
         {
             var beatmap = new Beatmap
@@ -197,8 +215,25 @@ namespace osu.Game.Tests.Gameplay
 
         private class JudgeableHitObject : HitObject
         {
-            public override Judgement CreateJudgement() => new Judgement();
+            private readonly bool affectsCombo;
+
+            public JudgeableHitObject(bool affectsCombo = true)
+            {
+                this.affectsCombo = affectsCombo;
+            }
+
+            public override Judgement CreateJudgement() => new TestJudgement(affectsCombo);
             protected override HitWindows CreateHitWindows() => new HitWindows();
+
+            private class TestJudgement : Judgement
+            {
+                public override bool AffectsCombo { get; }
+
+                public TestJudgement(bool affectsCombo)
+                {
+                    AffectsCombo = affectsCombo;
+                }
+            }
         }
     }
 }

osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs

@@ -19,24 +19,18 @@ namespace osu.Game.Tests.NonVisual
     [TestFixture]
     public class CustomDataDirectoryTest
     {
-        [SetUp]
-        public void SetUp()
-        {
-            if (Directory.Exists(customPath))
-                Directory.Delete(customPath, true);
-        }
-
         [Test]
         public void TestDefaultDirectory()
         {
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestDefaultDirectory)))
+            using (HeadlessGameHost host = new CustomTestHeadlessGameHost(nameof(TestDefaultDirectory)))
             {
                 try
                 {
+                    string defaultStorageLocation = getDefaultLocationFor(nameof(TestDefaultDirectory));
+
                     var osu = loadOsu(host);
                     var storage = osu.Dependencies.Get<Storage>();
 
-                    string defaultStorageLocation = Path.Combine(RuntimeInfo.StartupDirectory, "headless", nameof(TestDefaultDirectory));
                     Assert.That(storage.GetFullPath("."), Is.EqualTo(defaultStorageLocation));
                 }
                 finally
@@ -46,21 +40,14 @@ namespace osu.Game.Tests.NonVisual
             }
         }
 
-        private string customPath => Path.Combine(RuntimeInfo.StartupDirectory, "custom-path");
-
         [Test]
         public void TestCustomDirectory()
         {
-            using (var host = new HeadlessGameHost(nameof(TestCustomDirectory)))
+            string customPath = prepareCustomPath();
+
+            using (var host = new CustomTestHeadlessGameHost(nameof(TestCustomDirectory)))
             {
-                string defaultStorageLocation = Path.Combine(RuntimeInfo.StartupDirectory, "headless", nameof(TestCustomDirectory));
-
-                // need access before the game has constructed its own storage yet.
-                Storage storage = new DesktopStorage(defaultStorageLocation, host);
-                // manual cleaning so we can prepare a config file.
-                storage.DeleteDirectory(string.Empty);
-
-                using (var storageConfig = new StorageConfigManager(storage))
+                using (var storageConfig = new StorageConfigManager(host.InitialStorage))
                     storageConfig.Set(StorageConfig.FullPath, customPath);
 
                 try
@@ -68,7 +55,7 @@ namespace osu.Game.Tests.NonVisual
                     var osu = loadOsu(host);
 
                     // switch to DI'd storage
-                    storage = osu.Dependencies.Get<Storage>();
+                    var storage = osu.Dependencies.Get<Storage>();
 
                     Assert.That(storage.GetFullPath("."), Is.EqualTo(customPath));
                 }
@@ -82,16 +69,11 @@ namespace osu.Game.Tests.NonVisual
         [Test]
         public void TestSubDirectoryLookup()
         {
-            using (var host = new HeadlessGameHost(nameof(TestSubDirectoryLookup)))
+            string customPath = prepareCustomPath();
+
+            using (var host = new CustomTestHeadlessGameHost(nameof(TestSubDirectoryLookup)))
             {
-                string defaultStorageLocation = Path.Combine(RuntimeInfo.StartupDirectory, "headless", nameof(TestSubDirectoryLookup));
-
-                // need access before the game has constructed its own storage yet.
-                Storage storage = new DesktopStorage(defaultStorageLocation, host);
-                // manual cleaning so we can prepare a config file.
-                storage.DeleteDirectory(string.Empty);
-
-                using (var storageConfig = new StorageConfigManager(storage))
+                using (var storageConfig = new StorageConfigManager(host.InitialStorage))
                     storageConfig.Set(StorageConfig.FullPath, customPath);
 
                 try
@@ -99,7 +81,7 @@ namespace osu.Game.Tests.NonVisual
                     var osu = loadOsu(host);
 
                     // switch to DI'd storage
-                    storage = osu.Dependencies.Get<Storage>();
+                    var storage = osu.Dependencies.Get<Storage>();
 
                     string actualTestFile = Path.Combine(customPath, "rulesets", "test");
 
@@ -120,10 +102,14 @@ namespace osu.Game.Tests.NonVisual
         [Test]
         public void TestMigration()
         {
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestMigration)))
+            string customPath = prepareCustomPath();
+
+            using (HeadlessGameHost host = new CustomTestHeadlessGameHost(nameof(TestMigration)))
             {
                 try
                 {
+                    string defaultStorageLocation = getDefaultLocationFor(nameof(TestMigration));
+
                     var osu = loadOsu(host);
                     var storage = osu.Dependencies.Get<Storage>();
 
@@ -139,8 +125,6 @@ namespace osu.Game.Tests.NonVisual
                     // for testing nested files are not ignored (only top level)
                     host.Storage.GetStorageForDirectory("test-nested").GetStorageForDirectory("cache");
 
-                    string defaultStorageLocation = Path.Combine(RuntimeInfo.StartupDirectory, "headless", nameof(TestMigration));
-
                     Assert.That(storage.GetFullPath("."), Is.EqualTo(defaultStorageLocation));
 
                     osu.Migrate(customPath);
@@ -178,14 +162,15 @@ namespace osu.Game.Tests.NonVisual
         [Test]
         public void TestMigrationBetweenTwoTargets()
         {
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestMigrationBetweenTwoTargets)))
+            string customPath = prepareCustomPath();
+            string customPath2 = prepareCustomPath("-2");
+
+            using (HeadlessGameHost host = new CustomTestHeadlessGameHost(nameof(TestMigrationBetweenTwoTargets)))
             {
                 try
                 {
                     var osu = loadOsu(host);
 
-                    string customPath2 = $"{customPath}-2";
-
                     const string database_filename = "client.db";
 
                     Assert.DoesNotThrow(() => osu.Migrate(customPath));
@@ -207,7 +192,9 @@ namespace osu.Game.Tests.NonVisual
         [Test]
         public void TestMigrationToSameTargetFails()
         {
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestMigrationToSameTargetFails)))
+            string customPath = prepareCustomPath();
+
+            using (HeadlessGameHost host = new CustomTestHeadlessGameHost(nameof(TestMigrationToSameTargetFails)))
             {
                 try
                 {
@@ -226,7 +213,9 @@ namespace osu.Game.Tests.NonVisual
         [Test]
         public void TestMigrationToNestedTargetFails()
         {
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestMigrationToNestedTargetFails)))
+            string customPath = prepareCustomPath();
+
+            using (HeadlessGameHost host = new CustomTestHeadlessGameHost(nameof(TestMigrationToNestedTargetFails)))
             {
                 try
                 {
@@ -253,7 +242,9 @@ namespace osu.Game.Tests.NonVisual
         [Test]
         public void TestMigrationToSeeminglyNestedTarget()
         {
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestMigrationToSeeminglyNestedTarget)))
+            string customPath = prepareCustomPath();
+
+            using (HeadlessGameHost host = new CustomTestHeadlessGameHost(nameof(TestMigrationToSeeminglyNestedTarget)))
             {
                 try
                 {
@@ -282,6 +273,7 @@ namespace osu.Game.Tests.NonVisual
             var osu = new OsuGameBase();
             Task.Run(() => host.Run(osu));
             waitForOrAssert(() => osu.IsLoaded, @"osu! failed to start in a reasonable amount of time");
+
             return osu;
         }
 
@@ -294,5 +286,39 @@ namespace osu.Game.Tests.NonVisual
 
             Assert.IsTrue(task.Wait(timeout), failureMessage);
         }
+
+        private static string getDefaultLocationFor(string testTypeName)
+        {
+            string path = Path.Combine(RuntimeInfo.StartupDirectory, "headless", testTypeName);
+
+            if (Directory.Exists(path))
+                Directory.Delete(path, true);
+
+            return path;
+        }
+
+        private string prepareCustomPath(string suffix = "")
+        {
+            string path = Path.Combine(RuntimeInfo.StartupDirectory, $"custom-path{suffix}");
+
+            if (Directory.Exists(path))
+                Directory.Delete(path, true);
+
+            return path;
+        }
+
+        public class CustomTestHeadlessGameHost : HeadlessGameHost
+        {
+            public Storage InitialStorage { get; }
+
+            public CustomTestHeadlessGameHost(string name)
+                : base(name)
+            {
+                string defaultStorageLocation = getDefaultLocationFor(name);
+
+                InitialStorage = new DesktopStorage(defaultStorageLocation, this);
+                InitialStorage.DeleteDirectory(string.Empty);
+            }
+        }
     }
 }

osu.Game.Tests/Online/TestDummyAPIRequestHandling.cs

@@ -8,7 +8,6 @@ using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Chat;
 using osu.Game.Tests.Visual;
-using osu.Game.Users;
 
 namespace osu.Game.Tests.Online
 {
@@ -55,7 +54,7 @@ namespace osu.Game.Tests.Online
             AddStep("fire request", () =>
             {
                 gotResponse = false;
-                request = new LeaveChannelRequest(new Channel(), new User());
+                request = new LeaveChannelRequest(new Channel());
                 request.Success += () => gotResponse = true;
                 API.Queue(request);
             });
@@ -74,7 +73,7 @@ namespace osu.Game.Tests.Online
             AddStep("fire request", () =>
             {
                 gotResponse = false;
-                request = new LeaveChannelRequest(new Channel(), new User());
+                request = new LeaveChannelRequest(new Channel());
                 request.Success += () => gotResponse = true;
                 API.Perform(request);
             });
@@ -93,7 +92,7 @@ namespace osu.Game.Tests.Online
             AddStep("fire request", () =>
             {
                 gotResponse = false;
-                request = new LeaveChannelRequest(new Channel(), new User());
+                request = new LeaveChannelRequest(new Channel());
                 request.Success += () => gotResponse = true;
                 API.PerformAsync(request);
             });

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

@@ -0,0 +1,61 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using osu.Framework.Allocation;
+using osu.Game.Beatmaps;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Rulesets;
+using osu.Game.Screens.Multi;
+using osu.Game.Users;
+
+namespace osu.Game.Tests.Visual.Multiplayer
+{
+    public abstract class RoomManagerTestScene : MultiplayerTestScene
+    {
+        [Cached(Type = typeof(IRoomManager))]
+        protected TestRoomManager RoomManager { get; } = new TestRoomManager();
+
+        public override void SetUpSteps()
+        {
+            base.SetUpSteps();
+
+            AddStep("clear rooms", () => RoomManager.Rooms.Clear());
+        }
+
+        protected void AddRooms(int count, RulesetInfo ruleset = null)
+        {
+            AddStep("add rooms", () =>
+            {
+                for (int i = 0; i < count; i++)
+                {
+                    var room = new Room
+                    {
+                        RoomID = { Value = i },
+                        Name = { Value = $"Room {i}" },
+                        Host = { Value = new User { Username = "Host" } },
+                        EndDate = { Value = DateTimeOffset.Now + TimeSpan.FromSeconds(10) },
+                        Category = { Value = i % 2 == 0 ? RoomCategory.Spotlight : RoomCategory.Normal }
+                    };
+
+                    if (ruleset != null)
+                    {
+                        room.Playlist.Add(new PlaylistItem
+                        {
+                            Ruleset = { Value = ruleset },
+                            Beatmap =
+                            {
+                                Value = new BeatmapInfo
+                                {
+                                    Metadata = new BeatmapMetadata()
+                                }
+                            }
+                        });
+                    }
+
+                    RoomManager.Rooms.Add(room);
+                }
+            });
+        }
+    }
+}

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

@@ -0,0 +1,35 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using osu.Framework.Bindables;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Screens.Multi;
+
+namespace osu.Game.Tests.Visual.Multiplayer
+{
+    public class TestRoomManager : IRoomManager
+    {
+        public event Action RoomsUpdated
+        {
+            add { }
+            remove { }
+        }
+
+        public readonly BindableList<Room> Rooms = new BindableList<Room>();
+
+        public Bindable<bool> InitialRoomsReceived { get; } = new Bindable<bool>(true);
+
+        IBindableList<Room> IRoomManager.Rooms => Rooms;
+
+        public void CreateRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null) => Rooms.Add(room);
+
+        public void JoinRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
+        {
+        }
+
+        public void PartRoom()
+        {
+        }
+    }
+}

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

@@ -0,0 +1,20 @@
+// 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.Game.Screens.Multi.Lounge.Components;
+
+namespace osu.Game.Tests.Visual.Multiplayer
+{
+    public class TestSceneLoungeFilterControl : OsuTestScene
+    {
+        public TestSceneLoungeFilterControl()
+        {
+            Child = new FilterControl
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre
+            };
+        }
+    }
+}

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

@@ -16,7 +16,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [SetUp]
         public void Setup() => Schedule(() =>
         {
-            Room.CopyFrom(new Room());
+            Room = new Room();
 
             Child = new RoomInfo
             {

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

@@ -1,30 +1,22 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Online.Multiplayer;
-using osu.Game.Rulesets;
 using osu.Game.Rulesets.Catch;
 using osu.Game.Rulesets.Osu;
-using osu.Game.Screens.Multi;
 using osu.Game.Screens.Multi.Lounge.Components;
-using osu.Game.Users;
 using osuTK.Graphics;
+using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestSceneLoungeRoomsContainer : MultiplayerTestScene
+    public class TestSceneLoungeRoomsContainer : RoomManagerTestScene
     {
-        [Cached(Type = typeof(IRoomManager))]
-        private TestRoomManager roomManager = new TestRoomManager();
-
         private RoomsContainer container;
 
         [BackgroundDependencyLoader]
@@ -39,34 +31,57 @@ namespace osu.Game.Tests.Visual.Multiplayer
             };
         }
 
-        public override void SetUpSteps()
-        {
-            base.SetUpSteps();
-
-            AddStep("clear rooms", () => roomManager.Rooms.Clear());
-        }
-
         [Test]
         public void TestBasicListChanges()
         {
-            addRooms(3);
+            AddRooms(3);
 
             AddAssert("has 3 rooms", () => container.Rooms.Count == 3);
-            AddStep("remove first room", () => roomManager.Rooms.Remove(roomManager.Rooms.FirstOrDefault()));
+            AddStep("remove first room", () => RoomManager.Rooms.Remove(RoomManager.Rooms.FirstOrDefault()));
             AddAssert("has 2 rooms", () => container.Rooms.Count == 2);
             AddAssert("first room removed", () => container.Rooms.All(r => r.Room.RoomID.Value != 0));
 
             AddStep("select first room", () => container.Rooms.First().Action?.Invoke());
-            AddAssert("first room selected", () => Room == roomManager.Rooms.First());
+            AddAssert("first room selected", () => checkRoomSelected(RoomManager.Rooms.First()));
 
             AddStep("join first room", () => container.Rooms.First().Action?.Invoke());
-            AddAssert("first room joined", () => roomManager.Rooms.First().Status.Value is JoinedRoomStatus);
+            AddAssert("first room joined", () => RoomManager.Rooms.First().Status.Value is JoinedRoomStatus);
+        }
+
+        [Test]
+        public void TestKeyboardNavigation()
+        {
+            AddRooms(3);
+
+            AddAssert("no selection", () => checkRoomSelected(null));
+
+            press(Key.Down);
+            AddAssert("first room selected", () => checkRoomSelected(RoomManager.Rooms.First()));
+
+            press(Key.Up);
+            AddAssert("first room selected", () => checkRoomSelected(RoomManager.Rooms.First()));
+
+            press(Key.Down);
+            press(Key.Down);
+            AddAssert("last room selected", () => checkRoomSelected(RoomManager.Rooms.Last()));
+
+            press(Key.Enter);
+            AddAssert("last room joined", () => RoomManager.Rooms.Last().Status.Value is JoinedRoomStatus);
+        }
+
+        private void press(Key down)
+        {
+            AddStep($"press {down}", () =>
+            {
+                InputManager.PressKey(down);
+                InputManager.ReleaseKey(down);
+            });
         }
 
         [Test]
         public void TestStringFiltering()
         {
-            addRooms(4);
+            AddRooms(4);
 
             AddUntilStep("4 rooms visible", () => container.Rooms.Count(r => r.IsPresent) == 4);
 
@@ -82,8 +97,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [Test]
         public void TestRulesetFiltering()
         {
-            addRooms(2, new OsuRuleset().RulesetInfo);
-            addRooms(3, new CatchRuleset().RulesetInfo);
+            AddRooms(2, new OsuRuleset().RulesetInfo);
+            AddRooms(3, new CatchRuleset().RulesetInfo);
 
             AddUntilStep("5 rooms visible", () => container.Rooms.Count(r => r.IsPresent) == 5);
 
@@ -96,67 +111,10 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddUntilStep("3 rooms visible", () => container.Rooms.Count(r => r.IsPresent) == 3);
         }
 
-        private void addRooms(int count, RulesetInfo ruleset = null)
-        {
-            AddStep("add rooms", () =>
-            {
-                for (int i = 0; i < count; i++)
-                {
-                    var room = new Room
-                    {
-                        RoomID = { Value = i },
-                        Name = { Value = $"Room {i}" },
-                        Host = { Value = new User { Username = "Host" } },
-                        EndDate = { Value = DateTimeOffset.Now + TimeSpan.FromSeconds(10) }
-                    };
-
-                    if (ruleset != null)
-                    {
-                        room.Playlist.Add(new PlaylistItem
-                        {
-                            Ruleset = { Value = ruleset },
-                            Beatmap =
-                            {
-                                Value = new BeatmapInfo
-                                {
-                                    Metadata = new BeatmapMetadata()
-                                }
-                            }
-                        });
-                    }
-
-                    roomManager.Rooms.Add(room);
-                }
-            });
-        }
+        private bool checkRoomSelected(Room room) => Room == room;
 
         private void joinRequested(Room room) => room.Status.Value = new JoinedRoomStatus();
 
-        private class TestRoomManager : IRoomManager
-        {
-            public event Action RoomsUpdated
-            {
-                add { }
-                remove { }
-            }
-
-            public readonly BindableList<Room> Rooms = new BindableList<Room>();
-
-            public Bindable<bool> InitialRoomsReceived { get; } = new Bindable<bool>(true);
-
-            IBindableList<Room> IRoomManager.Rooms => Rooms;
-
-            public void CreateRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null) => Rooms.Add(room);
-
-            public void JoinRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
-            {
-            }
-
-            public void PartRoom()
-            {
-            }
-        }
-
         private class JoinedRoomStatus : RoomStatus
         {
             public override string Message => "Joined";

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

@@ -0,0 +1,58 @@
+// 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;
+using osu.Framework.Screens;
+using osu.Framework.Testing;
+using osu.Game.Graphics.Containers;
+using osu.Game.Screens.Multi.Lounge;
+using osu.Game.Screens.Multi.Lounge.Components;
+
+namespace osu.Game.Tests.Visual.Multiplayer
+{
+    public class TestSceneLoungeSubScreen : RoomManagerTestScene
+    {
+        private LoungeSubScreen loungeScreen;
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+        }
+
+        public override void SetUpSteps()
+        {
+            base.SetUpSteps();
+
+            AddStep("push screen", () => LoadScreen(loungeScreen = new LoungeSubScreen
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Width = 0.5f,
+            }));
+
+            AddUntilStep("wait for present", () => loungeScreen.IsCurrentScreen());
+        }
+
+        private RoomsContainer roomsContainer => loungeScreen.ChildrenOfType<RoomsContainer>().First();
+
+        [Test]
+        public void TestScrollSelectedIntoView()
+        {
+            AddRooms(30);
+
+            AddUntilStep("first room is not masked", () => checkRoomVisible(roomsContainer.Rooms.First()));
+
+            AddStep("select last room", () => roomsContainer.Rooms.Last().Action?.Invoke());
+
+            AddUntilStep("first room is masked", () => !checkRoomVisible(roomsContainer.Rooms.First()));
+            AddUntilStep("last room is not masked", () => checkRoomVisible(roomsContainer.Rooms.Last()));
+        }
+
+        private bool checkRoomVisible(DrawableRoom room) =>
+            loungeScreen.ChildrenOfType<OsuScrollContainer>().First().ScreenSpaceDrawQuad
+                        .Contains(room.ScreenSpaceDrawQuad.Centre);
+    }
+}

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

@@ -26,7 +26,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [SetUp]
         public void Setup() => Schedule(() =>
         {
-            Room.Playlist.Clear();
+            Room = new Room();
 
             Child = new MatchBeatmapDetailArea
             {

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

@@ -14,6 +14,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
     {
         public TestSceneMatchHeader()
         {
+            Room = new Room();
             Room.Playlist.Add(new PlaylistItem
             {
                 Beatmap =

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

@@ -6,6 +6,7 @@ using Newtonsoft.Json;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Online.API;
+using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.Multi.Match.Components;
 using osu.Game.Users;
 using osuTK;
@@ -18,7 +19,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         public TestSceneMatchLeaderboard()
         {
-            Room.RoomID.Value = 3;
+            Room = new Room { RoomID = { Value = 3 } };
 
             Add(new MatchLeaderboard
             {

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

@@ -14,6 +14,7 @@ using osu.Framework.Platform;
 using osu.Framework.Screens;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
+using osu.Game.Online.Multiplayer;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.Multi.Components;
@@ -95,7 +96,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [SetUp]
         public void Setup() => Schedule(() =>
         {
-            Room.Playlist.Clear();
+            Room = new Room();
         });
 
         [Test]

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

@@ -48,7 +48,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [SetUp]
         public void Setup() => Schedule(() =>
         {
-            Room.CopyFrom(new Room());
+            Room = new Room();
         });
 
         [SetUpSteps]

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

@@ -3,6 +3,7 @@
 
 using NUnit.Framework;
 using osu.Framework.Graphics;
+using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.Multi.Components;
 using osuTK;
 
@@ -12,22 +13,22 @@ namespace osu.Game.Tests.Visual.Multiplayer
     {
         protected override bool UseOnlineAPI => true;
 
-        public TestSceneOverlinedParticipants()
+        [SetUp]
+        public void Setup() => Schedule(() =>
         {
-            Room.RoomID.Value = 7;
-        }
+            Room = new Room { RoomID = { Value = 7 } };
+        });
 
         [Test]
         public void TestHorizontalLayout()
         {
             AddStep("create component", () =>
             {
-                Child = new OverlinedParticipants(Direction.Horizontal)
+                Child = new ParticipantsDisplay(Direction.Horizontal)
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     Width = 500,
-                    AutoSizeAxes = Axes.Y,
                 };
             });
         }
@@ -37,7 +38,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             AddStep("create component", () =>
             {
-                Child = new OverlinedParticipants(Direction.Vertical)
+                Child = new ParticipantsDisplay(Direction.Vertical)
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,

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

@@ -4,7 +4,7 @@
 using osu.Framework.Graphics;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Rulesets.Osu;
-using osu.Game.Screens.Multi.Components;
+using osu.Game.Screens.Multi;
 using osu.Game.Tests.Beatmaps;
 using osuTK;
 
@@ -16,6 +16,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         public TestSceneOverlinedPlaylist()
         {
+            Room = new Room { RoomID = { Value = 7 } };
+
             for (int i = 0; i < 10; i++)
             {
                 Room.Playlist.Add(new PlaylistItem
@@ -26,7 +28,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 });
             }
 
-            Add(new OverlinedPlaylist(false)
+            Add(new DrawableRoomPlaylist(false, false)
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,

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

@@ -1,7 +1,9 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using NUnit.Framework;
 using osu.Framework.Graphics;
+using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.Multi.Components;
 
 namespace osu.Game.Tests.Visual.Multiplayer
@@ -10,10 +12,14 @@ namespace osu.Game.Tests.Visual.Multiplayer
     {
         protected override bool UseOnlineAPI => true;
 
+        [SetUp]
+        public void Setup() => Schedule(() =>
+        {
+            Room = new Room { RoomID = { Value = 7 } };
+        });
+
         public TestSceneParticipantsList()
         {
-            Room.RoomID.Value = 7;
-
             Add(new ParticipantsList { RelativeSizeAxes = Axes.Both });
         }
     }

osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs

@@ -6,6 +6,7 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Audio.Track;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Screens;
 using osu.Game.Beatmaps;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Mods;
@@ -70,6 +71,23 @@ namespace osu.Game.Tests.Visual.Navigation
             AddAssert("Ensure time wasn't reset to preview point", () => track().CurrentTime < beatmap().Metadata.PreviewTime);
         }
 
+        [Test]
+        public void TestMenuMakesMusic()
+        {
+            WorkingBeatmap beatmap() => Game.Beatmap.Value;
+            Track track() => beatmap().Track;
+
+            TestSongSelect songSelect = null;
+
+            PushAndConfirm(() => songSelect = new TestSongSelect());
+
+            AddUntilStep("wait for no track", () => track() is TrackVirtual);
+
+            AddStep("return to menu", () => songSelect.Exit());
+
+            AddUntilStep("wait for track", () => !(track() is TrackVirtual) && track().IsRunning);
+        }
+
         [Test]
         public void TestExitSongSelectWithClick()
         {

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

@@ -0,0 +1,52 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics;
+using osu.Game.Overlays.News;
+using osu.Game.Online.API.Requests.Responses;
+using osu.Framework.Allocation;
+using osu.Game.Overlays;
+using osuTK;
+using System;
+
+namespace osu.Game.Tests.Visual.Online
+{
+    public class TestSceneNewsCard : OsuTestScene
+    {
+        [Cached]
+        private readonly OverlayColourProvider overlayColour = new OverlayColourProvider(OverlayColourScheme.Purple);
+
+        public TestSceneNewsCard()
+        {
+            Add(new FillFlowContainer<NewsCard>
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Direction = FillDirection.Vertical,
+                Width = 500,
+                AutoSizeAxes = Axes.Y,
+                Spacing = new Vector2(0, 20),
+                Children = new[]
+                {
+                    new NewsCard(new APINewsPost
+                    {
+                        Title = "This post has an image which starts with \"/\" and has many authors!",
+                        Preview = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
+                        Author = "someone, someone1, someone2, someone3, someone4",
+                        FirstImage = "/help/wiki/shared/news/banners/monthly-beatmapping-contest.png",
+                        PublishedAt = DateTimeOffset.Now
+                    }),
+                    new NewsCard(new APINewsPost
+                    {
+                        Title = "This post has a full-url image! (HTML entity: &amp;)",
+                        Preview = "boom (HTML entity: &amp;)",
+                        Author = "user (HTML entity: &amp;)",
+                        FirstImage = "https://assets.ppy.sh/artists/88/header.jpg",
+                        PublishedAt = DateTimeOffset.Now
+                    })
+                }
+            });
+        }
+    }
+}

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

@@ -80,9 +80,9 @@ namespace osu.Game.Tests.Visual.SongSelect
         [Test]
         public void TestRecommendedSelection()
         {
-            loadBeatmaps();
+            loadBeatmaps(carouselAdjust: carousel => carousel.GetRecommendedBeatmap = beatmaps => beatmaps.LastOrDefault());
 
-            AddStep("set recommendation function", () => carousel.GetRecommendedBeatmap = beatmaps => beatmaps.LastOrDefault());
+            AddStep("select last", () => carousel.SelectBeatmap(carousel.BeatmapSets.Last().Beatmaps.Last()));
 
             // check recommended was selected
             advanceSelection(direction: 1, diff: false);
@@ -114,7 +114,7 @@ namespace osu.Game.Tests.Visual.SongSelect
         {
             loadBeatmaps();
 
-            advanceSelection(direction: 1, diff: false);
+            AddStep("select first", () => carousel.SelectBeatmap(carousel.BeatmapSets.First().Beatmaps.First()));
             waitForSelection(1, 1);
 
             advanceSelection(direction: 1, diff: true);
@@ -707,9 +707,9 @@ namespace osu.Game.Tests.Visual.SongSelect
             checkVisibleItemCount(true, 15);
         }
 
-        private void loadBeatmaps(List<BeatmapSetInfo> beatmapSets = null, Func<FilterCriteria> initialCriteria = null)
+        private void loadBeatmaps(List<BeatmapSetInfo> beatmapSets = null, Func<FilterCriteria> initialCriteria = null, Action<BeatmapCarousel> carouselAdjust = null)
         {
-            createCarousel();
+            createCarousel(carouselAdjust);
 
             if (beatmapSets == null)
             {
@@ -730,17 +730,21 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddUntilStep("Wait for load", () => changed);
         }
 
-        private void createCarousel(Container target = null)
+        private void createCarousel(Action<BeatmapCarousel> carouselAdjust = null, Container target = null)
         {
             AddStep("Create carousel", () =>
             {
                 selectedSets.Clear();
                 eagerSelectedIDs.Clear();
 
-                (target ?? this).Child = carousel = new TestBeatmapCarousel
+                carousel = new TestBeatmapCarousel
                 {
                     RelativeSizeAxes = Axes.Both,
                 };
+
+                carouselAdjust?.Invoke(carousel);
+
+                (target ?? this).Child = carousel;
             });
         }
 

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

@@ -1,48 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using NUnit.Framework;
-using osu.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Game.Graphics.UserInterface;
-
-namespace osu.Game.Tests.Visual.UserInterface
-{
-    [TestFixture]
-    public class TestSceneNumberBox : OsuTestScene
-    {
-        private OsuNumberBox numberBox;
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            Child = new Container
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                RelativeSizeAxes = Axes.X,
-                Padding = new MarginPadding { Horizontal = 250 },
-                Child = numberBox = new OsuNumberBox
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    RelativeSizeAxes = Axes.X,
-                    PlaceholderText = "Insert numbers here"
-                }
-            };
-
-            clearInput();
-            AddStep("enter numbers", () => numberBox.Text = "987654321");
-            expectedValue("987654321");
-            clearInput();
-            AddStep("enter text + single number", () => numberBox.Text = "1 hello 2 world 3");
-            expectedValue("123");
-            clearInput();
-        }
-
-        private void clearInput() => AddStep("clear input", () => numberBox.Text = null);
-
-        private void expectedValue(string value) => AddAssert("expect number", () => numberBox.Text == value);
-    }
-}

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

@@ -0,0 +1,80 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using NUnit.Framework;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics.UserInterface;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    public class TestSceneOsuTextBox : OsuTestScene
+    {
+        private readonly OsuNumberBox numberBox;
+
+        public TestSceneOsuTextBox()
+        {
+            Child = new Container
+            {
+                Masking = true,
+                CornerRadius = 10f,
+                AutoSizeAxes = Axes.Both,
+                Padding = new MarginPadding(15f),
+                Children = new Drawable[]
+                {
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = Color4.DarkSlateGray,
+                        Alpha = 0.75f,
+                    },
+                    new FillFlowContainer
+                    {
+                        AutoSizeAxes = Axes.Both,
+                        Direction = FillDirection.Vertical,
+                        Padding = new MarginPadding(50f),
+                        Spacing = new Vector2(0f, 50f),
+                        Children = new[]
+                        {
+                            new OsuTextBox
+                            {
+                                Width = 500f,
+                                PlaceholderText = "Normal textbox",
+                            },
+                            new OsuPasswordTextBox
+                            {
+                                Width = 500f,
+                                PlaceholderText = "Password textbox",
+                            },
+                            numberBox = new OsuNumberBox
+                            {
+                                Width = 500f,
+                                PlaceholderText = "Number textbox"
+                            }
+                        }
+                    }
+                }
+            };
+        }
+
+        [Test]
+        public void TestNumberBox()
+        {
+            clearTextbox(numberBox);
+            AddStep("enter numbers", () => numberBox.Text = "987654321");
+            expectedValue(numberBox, "987654321");
+
+            clearTextbox(numberBox);
+            AddStep("enter text + single number", () => numberBox.Text = "1 hello 2 world 3");
+            expectedValue(numberBox, "123");
+
+            clearTextbox(numberBox);
+        }
+
+        private void clearTextbox(OsuTextBox textBox) => AddStep("clear textbox", () => textBox.Text = null);
+        private void expectedValue(OsuTextBox textBox, string value) => AddAssert("expected textbox value", () => textBox.Text == value);
+    }
+}

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

@@ -0,0 +1,25 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Game.Overlays;
+using osu.Game.Overlays.Rankings;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    public class TestSceneRankingsSortTabControl : OsuTestScene
+    {
+        [Cached]
+        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Green);
+
+        public TestSceneRankingsSortTabControl()
+        {
+            Child = new RankingsSortTabControl
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre
+            };
+        }
+    }
+}

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

@@ -5,7 +5,7 @@
     <PackageReference Include="DeepEqual" Version="2.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
   <PropertyGroup Label="Project">

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

@@ -7,7 +7,7 @@
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>

osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs

@@ -203,13 +203,14 @@ namespace osu.Game.Tournament.Screens.TeamIntro
                                         new Box
                                         {
                                             RelativeSizeAxes = Axes.Both,
-                                            Colour = TournamentGame.TEXT_COLOUR,
+                                            Colour = TournamentGame.ELEMENT_BACKGROUND_COLOUR,
                                         },
                                         new TournamentSpriteText
                                         {
                                             Anchor = Anchor.Centre,
                                             Origin = Anchor.Centre,
                                             Text = seeding.ToString("#,0"),
+                                            Colour = TournamentGame.ELEMENT_FOREGROUND_COLOUR
                                         },
                                     }
                                 },

osu.Game/Beatmaps/BeatmapManager.cs

@@ -283,14 +283,16 @@ namespace osu.Game.Beatmaps
         /// Returns a list of all usable <see cref="BeatmapSetInfo"/>s.
         /// </summary>
         /// <returns>A list of available <see cref="BeatmapSetInfo"/>.</returns>
-        public List<BeatmapSetInfo> GetAllUsableBeatmapSets(IncludedDetails includes = IncludedDetails.All) => GetAllUsableBeatmapSetsEnumerable(includes).ToList();
+        public List<BeatmapSetInfo> GetAllUsableBeatmapSets(IncludedDetails includes = IncludedDetails.All, bool includeProtected = false) =>
+            GetAllUsableBeatmapSetsEnumerable(includes, includeProtected).ToList();
 
         /// <summary>
         /// Returns a list of all usable <see cref="BeatmapSetInfo"/>s. Note that files are not populated.
         /// </summary>
         /// <param name="includes">The level of detail to include in the returned objects.</param>
+        /// <param name="includeProtected">Whether to include protected (system) beatmaps. These should not be included for gameplay playable use cases.</param>
         /// <returns>A list of available <see cref="BeatmapSetInfo"/>.</returns>
-        public IEnumerable<BeatmapSetInfo> GetAllUsableBeatmapSetsEnumerable(IncludedDetails includes)
+        public IEnumerable<BeatmapSetInfo> GetAllUsableBeatmapSetsEnumerable(IncludedDetails includes, bool includeProtected = false)
         {
             IQueryable<BeatmapSetInfo> queryable;
 
@@ -312,7 +314,7 @@ namespace osu.Game.Beatmaps
             // AsEnumerable used here to avoid applying the WHERE in sql. When done so, ef core 2.x uses an incorrect ORDER BY
             // clause which causes queries to take 5-10x longer.
             // TODO: remove if upgrading to EF core 3.x.
-            return queryable.AsEnumerable().Where(s => !s.DeletePending && !s.Protected);
+            return queryable.AsEnumerable().Where(s => !s.DeletePending && (includeProtected || !s.Protected));
         }
 
         /// <summary>

osu.Game/Beatmaps/BeatmapManager_BeatmapOnlineLookupQueue.cs

@@ -48,16 +48,13 @@ namespace osu.Game.Beatmaps
 
             public Task UpdateAsync(BeatmapSetInfo beatmapSet, CancellationToken cancellationToken)
             {
-                if (api?.State != APIState.Online)
-                    return Task.CompletedTask;
-
                 LogForModel(beatmapSet, "Performing online lookups...");
                 return Task.WhenAll(beatmapSet.Beatmaps.Select(b => UpdateAsync(beatmapSet, b, cancellationToken)).ToArray());
             }
 
             // todo: expose this when we need to do individual difficulty lookups.
             protected Task UpdateAsync(BeatmapSetInfo beatmapSet, BeatmapInfo beatmap, CancellationToken cancellationToken)
-                => Task.Factory.StartNew(() => lookup(beatmapSet, beatmap), cancellationToken, TaskCreationOptions.HideScheduler, updateScheduler);
+                => Task.Factory.StartNew(() => lookup(beatmapSet, beatmap), cancellationToken, TaskCreationOptions.HideScheduler | TaskCreationOptions.RunContinuationsAsynchronously, updateScheduler);
 
             private void lookup(BeatmapSetInfo set, BeatmapInfo beatmap)
             {
@@ -183,6 +180,7 @@ namespace osu.Game.Beatmaps
             public void Dispose()
             {
                 cacheDownloadRequest?.Dispose();
+                updateScheduler?.Dispose();
             }
 
             [Serializable]

osu.Game/Configuration/OsuConfigManager.cs

@@ -91,6 +91,7 @@ namespace osu.Game.Configuration
             Set(OsuSetting.FadePlayfieldWhenHealthLow, true);
             Set(OsuSetting.KeyOverlay, false);
             Set(OsuSetting.PositionalHitSounds, true);
+            Set(OsuSetting.AlwaysPlayFirstComboBreak, true);
             Set(OsuSetting.ScoreMeter, ScoreMeterType.HitErrorBoth);
 
             Set(OsuSetting.FloatingComments, false);
@@ -180,6 +181,7 @@ namespace osu.Game.Configuration
         ShowStoryboard,
         KeyOverlay,
         PositionalHitSounds,
+        AlwaysPlayFirstComboBreak,
         ScoreMeter,
         FloatingComments,
         ShowInterface,

osu.Game/Graphics/DateTooltip.cs

@@ -0,0 +1,78 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Cursor;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics.Sprites;
+using osuTK;
+
+namespace osu.Game.Graphics
+{
+    public class DateTooltip : VisibilityContainer, ITooltip
+    {
+        private readonly OsuSpriteText dateText, timeText;
+        private readonly Box background;
+
+        public DateTooltip()
+        {
+            AutoSizeAxes = Axes.Both;
+            Masking = true;
+            CornerRadius = 5;
+
+            Children = new Drawable[]
+            {
+                background = new Box
+                {
+                    RelativeSizeAxes = Axes.Both
+                },
+                new FillFlowContainer
+                {
+                    AutoSizeAxes = Axes.Both,
+                    Direction = FillDirection.Horizontal,
+                    Padding = new MarginPadding(10),
+                    Children = new Drawable[]
+                    {
+                        dateText = new OsuSpriteText
+                        {
+                            Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold),
+                            Anchor = Anchor.BottomLeft,
+                            Origin = Anchor.BottomLeft,
+                        },
+                        timeText = new OsuSpriteText
+                        {
+                            Font = OsuFont.GetFont(size: 12, weight: FontWeight.Regular),
+                            Anchor = Anchor.BottomLeft,
+                            Origin = Anchor.BottomLeft,
+                        }
+                    }
+                },
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            background.Colour = colours.GreySeafoamDarker;
+            timeText.Colour = colours.BlueLighter;
+        }
+
+        protected override void PopIn() => this.FadeIn(200, Easing.OutQuint);
+        protected override void PopOut() => this.FadeOut(200, Easing.OutQuint);
+
+        public bool SetContent(object content)
+        {
+            if (!(content is DateTimeOffset date))
+                return false;
+
+            dateText.Text = $"{date:d MMMM yyyy} ";
+            timeText.Text = $"{date:HH:mm:ss \"UTC\"z}";
+            return true;
+        }
+
+        public void Move(Vector2 pos) => Position = pos;
+    }
+}

osu.Game/Graphics/DrawableDate.cs

@@ -4,12 +4,9 @@
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
-using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Utils;
-using osuTK;
 
 namespace osu.Game.Graphics
 {
@@ -81,69 +78,5 @@ namespace osu.Game.Graphics
         public ITooltip GetCustomTooltip() => new DateTooltip();
 
         public object TooltipContent => Date;
-
-        private class DateTooltip : VisibilityContainer, ITooltip
-        {
-            private readonly OsuSpriteText dateText, timeText;
-            private readonly Box background;
-
-            public DateTooltip()
-            {
-                AutoSizeAxes = Axes.Both;
-                Masking = true;
-                CornerRadius = 5;
-
-                Children = new Drawable[]
-                {
-                    background = new Box
-                    {
-                        RelativeSizeAxes = Axes.Both
-                    },
-                    new FillFlowContainer
-                    {
-                        AutoSizeAxes = Axes.Both,
-                        Direction = FillDirection.Horizontal,
-                        Padding = new MarginPadding(10),
-                        Children = new Drawable[]
-                        {
-                            dateText = new OsuSpriteText
-                            {
-                                Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold),
-                                Anchor = Anchor.BottomLeft,
-                                Origin = Anchor.BottomLeft,
-                            },
-                            timeText = new OsuSpriteText
-                            {
-                                Font = OsuFont.GetFont(size: 12, weight: FontWeight.Regular),
-                                Anchor = Anchor.BottomLeft,
-                                Origin = Anchor.BottomLeft,
-                            }
-                        }
-                    },
-                };
-            }
-
-            [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
-            {
-                background.Colour = colours.GreySeafoamDarker;
-                timeText.Colour = colours.BlueLighter;
-            }
-
-            protected override void PopIn() => this.FadeIn(200, Easing.OutQuint);
-            protected override void PopOut() => this.FadeOut(200, Easing.OutQuint);
-
-            public bool SetContent(object content)
-            {
-                if (!(content is DateTimeOffset date))
-                    return false;
-
-                dateText.Text = $"{date:d MMMM yyyy} ";
-                timeText.Text = $"{date:HH:mm:ss \"UTC\"z}";
-                return true;
-            }
-
-            public void Move(Vector2 pos) => Position = pos;
-        }
     }
 }

osu.Game/Graphics/UserInterface/DownloadButton.cs

@@ -63,16 +63,19 @@ namespace osu.Game.Graphics.UserInterface
                     background.FadeColour(colours.Gray4, 500, Easing.InOutExpo);
                     icon.MoveToX(0, 500, Easing.InOutExpo);
                     checkmark.ScaleTo(Vector2.Zero, 500, Easing.InOutExpo);
+                    TooltipText = "Download";
                     break;
 
                 case DownloadState.Downloading:
                     background.FadeColour(colours.Blue, 500, Easing.InOutExpo);
                     icon.MoveToX(0, 500, Easing.InOutExpo);
                     checkmark.ScaleTo(Vector2.Zero, 500, Easing.InOutExpo);
+                    TooltipText = "Downloading...";
                     break;
 
                 case DownloadState.Downloaded:
                     background.FadeColour(colours.Yellow, 500, Easing.InOutExpo);
+                    TooltipText = "Importing";
                     break;
 
                 case DownloadState.LocallyAvailable:

osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs

@@ -24,6 +24,8 @@ namespace osu.Game.Graphics.UserInterface
             Child = new PasswordMaskChar(CalculatedTextSize),
         };
 
+        protected override bool AllowUniqueCharacterSamples => false;
+
         protected override bool AllowClipboardExport => false;
 
         private readonly CapsWarning warning;

osu.Game/Graphics/UserInterface/OsuTabControl.cs

@@ -23,6 +23,8 @@ namespace osu.Game.Graphics.UserInterface
     {
         private Color4 accentColour;
 
+        public const float HORIZONTAL_SPACING = 10;
+
         public virtual Color4 AccentColour
         {
             get => accentColour;
@@ -54,7 +56,7 @@ namespace osu.Game.Graphics.UserInterface
 
         public OsuTabControl()
         {
-            TabContainer.Spacing = new Vector2(10f, 0f);
+            TabContainer.Spacing = new Vector2(HORIZONTAL_SPACING, 0f);
 
             AddInternal(strip = new Box
             {

osu.Game/Graphics/UserInterface/OsuTabControlCheckbox.cs

@@ -21,7 +21,6 @@ namespace osu.Game.Graphics.UserInterface
     {
         private readonly Box box;
         private readonly SpriteText text;
-        private readonly SpriteIcon icon;
 
         private Color4? accentColour;
 
@@ -32,12 +31,6 @@ namespace osu.Game.Graphics.UserInterface
             {
                 accentColour = value;
 
-                if (Current.Value)
-                {
-                    text.Colour = AccentColour;
-                    icon.Colour = AccentColour;
-                }
-
                 updateFade();
             }
         }
@@ -52,6 +45,8 @@ namespace osu.Game.Graphics.UserInterface
 
         public OsuTabControlCheckbox()
         {
+            SpriteIcon icon;
+
             AutoSizeAxes = Axes.Both;
 
             Children = new Drawable[]
@@ -89,6 +84,8 @@ namespace osu.Game.Graphics.UserInterface
             {
                 icon.Icon = selected.NewValue ? FontAwesome.Regular.CheckCircle : FontAwesome.Regular.Circle;
                 text.Font = text.Font.With(weight: selected.NewValue ? FontWeight.Bold : FontWeight.Medium);
+
+                updateFade();
             };
         }
 
@@ -115,8 +112,8 @@ namespace osu.Game.Graphics.UserInterface
 
         private void updateFade()
         {
-            box.FadeTo(IsHovered ? 1 : 0, transition_length, Easing.OutQuint);
-            text.FadeColour(IsHovered ? Color4.White : AccentColour, transition_length, Easing.OutQuint);
+            box.FadeTo(Current.Value || IsHovered ? 1 : 0, transition_length, Easing.OutQuint);
+            text.FadeColour(Current.Value || IsHovered ? Color4.White : AccentColour, transition_length, Easing.OutQuint);
         }
     }
 }

osu.Game/Graphics/UserInterface/OsuTextBox.cs

@@ -1,7 +1,10 @@
 // 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 osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
 using osu.Framework.Audio.Track;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
@@ -11,6 +14,7 @@ using osuTK.Graphics;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
+using osu.Framework.Utils;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics.Containers;
 using osuTK;
@@ -19,6 +23,18 @@ namespace osu.Game.Graphics.UserInterface
 {
     public class OsuTextBox : BasicTextBox
     {
+        private readonly SampleChannel[] textAddedSamples = new SampleChannel[4];
+        private SampleChannel capsTextAddedSample;
+        private SampleChannel textRemovedSample;
+        private SampleChannel textCommittedSample;
+        private SampleChannel caretMovedSample;
+
+        /// <summary>
+        /// Whether to allow playing a different samples based on the type of character.
+        /// If set to false, the same sample will be used for all characters.
+        /// </summary>
+        protected virtual bool AllowUniqueCharacterSamples => true;
+
         protected override float LeftRightPadding => 10;
 
         protected override float CaretWidth => 3;
@@ -41,15 +57,54 @@ namespace osu.Game.Graphics.UserInterface
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colour)
+        private void load(OsuColour colour, AudioManager audio)
         {
             BackgroundUnfocused = Color4.Black.Opacity(0.5f);
             BackgroundFocused = OsuColour.Gray(0.3f).Opacity(0.8f);
             BackgroundCommit = BorderColour = colour.Yellow;
+
+            for (int i = 0; i < textAddedSamples.Length; i++)
+                textAddedSamples[i] = audio.Samples.Get($@"Keyboard/key-press-{1 + i}");
+
+            capsTextAddedSample = audio.Samples.Get(@"Keyboard/key-caps");
+            textRemovedSample = audio.Samples.Get(@"Keyboard/key-delete");
+            textCommittedSample = audio.Samples.Get(@"Keyboard/key-confirm");
+            caretMovedSample = audio.Samples.Get(@"Keyboard/key-movement");
         }
 
         protected override Color4 SelectionColour => new Color4(249, 90, 255, 255);
 
+        protected override void OnTextAdded(string added)
+        {
+            base.OnTextAdded(added);
+
+            if (added.Any(char.IsUpper) && AllowUniqueCharacterSamples)
+                capsTextAddedSample?.Play();
+            else
+                textAddedSamples[RNG.Next(0, 3)]?.Play();
+        }
+
+        protected override void OnTextRemoved(string removed)
+        {
+            base.OnTextRemoved(removed);
+
+            textRemovedSample?.Play();
+        }
+
+        protected override void OnTextCommitted(bool textChanged)
+        {
+            base.OnTextCommitted(textChanged);
+
+            textCommittedSample?.Play();
+        }
+
+        protected override void OnCaretMoved(bool selecting)
+        {
+            base.OnCaretMoved(selecting);
+
+            caretMovedSample?.Play();
+        }
+
         protected override void OnFocus(FocusEvent e)
         {
             BorderThickness = 3;

osu.Game/Input/Bindings/GlobalActionContainer.cs

@@ -35,6 +35,7 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(new[] { InputKey.Control, InputKey.T }, GlobalAction.ToggleToolbar),
             new KeyBinding(new[] { InputKey.Control, InputKey.O }, GlobalAction.ToggleSettings),
             new KeyBinding(new[] { InputKey.Control, InputKey.D }, GlobalAction.ToggleDirect),
+            new KeyBinding(new[] { InputKey.Control, InputKey.N }, GlobalAction.ToggleNotifications),
 
             new KeyBinding(InputKey.Escape, GlobalAction.Back),
             new KeyBinding(InputKey.ExtraMouseButton1, GlobalAction.Back),
@@ -157,5 +158,8 @@ namespace osu.Game.Input.Bindings
 
         [Description("Home")]
         Home,
+
+        [Description("Toggle notifications")]
+        ToggleNotifications
     }
 }

osu.Game/Input/KeyBindingStore.cs

@@ -55,6 +55,9 @@ namespace osu.Game.Input
                             RulesetID = rulesetId,
                             Variant = variant
                         });
+
+                        // required to ensure stable insert order (https://github.com/dotnet/efcore/issues/11686)
+                        usage.Context.SaveChanges();
                     }
                 }
             }

osu.Game/Online/API/APIRequest.cs

@@ -5,6 +5,7 @@ using System;
 using Newtonsoft.Json;
 using osu.Framework.IO.Network;
 using osu.Framework.Logging;
+using osu.Game.Users;
 
 namespace osu.Game.Online.API
 {
@@ -61,6 +62,11 @@ namespace osu.Game.Online.API
         protected APIAccess API;
         protected WebRequest WebRequest;
 
+        /// <summary>
+        /// The currently logged in user. Note that this will only be populated during <see cref="Perform"/>.
+        /// </summary>
+        protected User User { get; private set; }
+
         /// <summary>
         /// Invoked on successful completion of an API request.
         /// This will be scheduled to the API's internal scheduler (run on update thread automatically).
@@ -86,6 +92,7 @@ namespace osu.Game.Online.API
             }
 
             API = apiAccess;
+            User = apiAccess.LocalUser.Value;
 
             if (checkAndScheduleFailure())
                 return;

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

@@ -2,6 +2,8 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using Humanizer;
+using osu.Framework.IO.Network;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.Multi.Lounge.Components;
 
@@ -9,39 +11,28 @@ namespace osu.Game.Online.API.Requests
 {
     public class GetRoomsRequest : APIRequest<List<Room>>
     {
-        private readonly PrimaryFilter primaryFilter;
+        private readonly RoomStatusFilter statusFilter;
+        private readonly RoomCategoryFilter categoryFilter;
 
-        public GetRoomsRequest(PrimaryFilter primaryFilter)
+        public GetRoomsRequest(RoomStatusFilter statusFilter, RoomCategoryFilter categoryFilter)
         {
-            this.primaryFilter = primaryFilter;
+            this.statusFilter = statusFilter;
+            this.categoryFilter = categoryFilter;
         }
 
-        protected override string Target
+        protected override WebRequest CreateWebRequest()
         {
-            get
-            {
-                string target = "rooms";
+            var req = base.CreateWebRequest();
 
-                switch (primaryFilter)
-                {
-                    case PrimaryFilter.Open:
-                        break;
+            if (statusFilter != RoomStatusFilter.Open)
+                req.AddParameter("mode", statusFilter.ToString().Underscore().ToLowerInvariant());
 
-                    case PrimaryFilter.Owned:
-                        target += "/owned";
-                        break;
+            if (categoryFilter != RoomCategoryFilter.Any)
+                req.AddParameter("category", categoryFilter.ToString().Underscore().ToLowerInvariant());
 
-                    case PrimaryFilter.Participated:
-                        target += "/participated";
-                        break;
-
-                    case PrimaryFilter.RecentlyEnded:
-                        target += "/ended";
-                        break;
-                }
-
-                return target;
-            }
+            return req;
         }
+
+        protected override string Target => "rooms";
     }
 }

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

@@ -4,19 +4,16 @@
 using System.Net.Http;
 using osu.Framework.IO.Network;
 using osu.Game.Online.Chat;
-using osu.Game.Users;
 
 namespace osu.Game.Online.API.Requests
 {
     public class JoinChannelRequest : APIRequest
     {
         private readonly Channel channel;
-        private readonly User user;
 
-        public JoinChannelRequest(Channel channel, User user)
+        public JoinChannelRequest(Channel channel)
         {
             this.channel = channel;
-            this.user = user;
         }
 
         protected override WebRequest CreateWebRequest()
@@ -26,6 +23,6 @@ namespace osu.Game.Online.API.Requests
             return req;
         }
 
-        protected override string Target => $@"chat/channels/{channel.Id}/users/{user.Id}";
+        protected override string Target => $@"chat/channels/{channel.Id}/users/{User.Id}";
     }
 }

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

@@ -4,19 +4,16 @@
 using System.Net.Http;
 using osu.Framework.IO.Network;
 using osu.Game.Online.Multiplayer;
-using osu.Game.Users;
 
 namespace osu.Game.Online.API.Requests
 {
     public class JoinRoomRequest : APIRequest
     {
         private readonly Room room;
-        private readonly User user;
 
-        public JoinRoomRequest(Room room, User user)
+        public JoinRoomRequest(Room room)
         {
             this.room = room;
-            this.user = user;
         }
 
         protected override WebRequest CreateWebRequest()
@@ -26,6 +23,6 @@ namespace osu.Game.Online.API.Requests
             return req;
         }
 
-        protected override string Target => $"rooms/{room.RoomID.Value}/users/{user.Id}";
+        protected override string Target => $"rooms/{room.RoomID.Value}/users/{User.Id}";
     }
 }

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

@@ -4,19 +4,16 @@
 using System.Net.Http;
 using osu.Framework.IO.Network;
 using osu.Game.Online.Chat;
-using osu.Game.Users;
 
 namespace osu.Game.Online.API.Requests
 {
     public class LeaveChannelRequest : APIRequest
     {
         private readonly Channel channel;
-        private readonly User user;
 
-        public LeaveChannelRequest(Channel channel, User user)
+        public LeaveChannelRequest(Channel channel)
         {
             this.channel = channel;
-            this.user = user;
         }
 
         protected override WebRequest CreateWebRequest()
@@ -26,6 +23,6 @@ namespace osu.Game.Online.API.Requests
             return req;
         }
 
-        protected override string Target => $@"chat/channels/{channel.Id}/users/{user.Id}";
+        protected override string Target => $@"chat/channels/{channel.Id}/users/{User.Id}";
     }
 }

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

@@ -4,19 +4,16 @@
 using System.Net.Http;
 using osu.Framework.IO.Network;
 using osu.Game.Online.Multiplayer;
-using osu.Game.Users;
 
 namespace osu.Game.Online.API.Requests
 {
     public class PartRoomRequest : APIRequest
     {
         private readonly Room room;
-        private readonly User user;
 
-        public PartRoomRequest(Room room, User user)
+        public PartRoomRequest(Room room)
         {
             this.room = room;
-            this.user = user;
         }
 
         protected override WebRequest CreateWebRequest()
@@ -26,6 +23,6 @@ namespace osu.Game.Online.API.Requests
             return req;
         }
 
-        protected override string Target => $"rooms/{room.RoomID.Value}/users/{user.Id}";
+        protected override string Target => $"rooms/{room.RoomID.Value}/users/{User.Id}";
     }
 }

osu.Game/Online/API/Requests/Responses/APINewsPost.cs

@@ -0,0 +1,57 @@
+// 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 Newtonsoft.Json;
+using System;
+using System.Net;
+
+namespace osu.Game.Online.API.Requests.Responses
+{
+    public class APINewsPost
+    {
+        [JsonProperty("id")]
+        public long Id { get; set; }
+
+        private string author;
+
+        [JsonProperty("author")]
+        public string Author
+        {
+            get => author;
+            set => author = WebUtility.HtmlDecode(value);
+        }
+
+        [JsonProperty("edit_url")]
+        public string EditUrl { get; set; }
+
+        [JsonProperty("first_image")]
+        public string FirstImage { get; set; }
+
+        [JsonProperty("published_at")]
+        public DateTimeOffset PublishedAt { get; set; }
+
+        [JsonProperty("updated_at")]
+        public DateTimeOffset UpdatedAt { get; set; }
+
+        [JsonProperty("slug")]
+        public string Slug { get; set; }
+
+        private string title;
+
+        [JsonProperty("title")]
+        public string Title
+        {
+            get => title;
+            set => title = WebUtility.HtmlDecode(value);
+        }
+
+        private string preview;
+
+        [JsonProperty("preview")]
+        public string Preview
+        {
+            get => preview;
+            set => preview = WebUtility.HtmlDecode(value);
+        }
+    }
+}

osu.Game/Online/Chat/ChannelManager.cs

@@ -381,7 +381,7 @@ namespace osu.Game.Online.Chat
                         break;
 
                     default:
-                        var req = new JoinChannelRequest(channel, api.LocalUser.Value);
+                        var req = new JoinChannelRequest(channel);
                         req.Success += () => joinChannel(channel, fetchInitialMessages);
                         req.Failure += ex => LeaveChannel(channel);
                         api.Queue(req);
@@ -410,7 +410,7 @@ namespace osu.Game.Online.Chat
 
             if (channel.Joined.Value)
             {
-                api.Queue(new LeaveChannelRequest(channel, api.LocalUser.Value));
+                api.Queue(new LeaveChannelRequest(channel));
                 channel.Joined.Value = false;
             }
         }

osu.Game/Online/Leaderboards/Leaderboard.cs

@@ -170,36 +170,37 @@ namespace osu.Game.Online.Leaderboards
         {
             InternalChildren = new Drawable[]
             {
-                new GridContainer
+                new OsuContextMenuContainer
                 {
                     RelativeSizeAxes = Axes.Both,
-                    RowDimensions = new[]
+                    Masking = true,
+                    Child = new GridContainer
                     {
-                        new Dimension(),
-                        new Dimension(GridSizeMode.AutoSize),
-                    },
-                    Content = new[]
-                    {
-                        new Drawable[]
+                        RelativeSizeAxes = Axes.Both,
+                        RowDimensions = new[]
                         {
-                            new OsuContextMenuContainer
+                            new Dimension(),
+                            new Dimension(GridSizeMode.AutoSize),
+                        },
+                        Content = new[]
+                        {
+                            new Drawable[]
                             {
-                                RelativeSizeAxes = Axes.Both,
-                                Child = scrollContainer = new OsuScrollContainer
+                                scrollContainer = new OsuScrollContainer
                                 {
                                     RelativeSizeAxes = Axes.Both,
                                     ScrollbarVisible = false,
                                 }
+                            },
+                            new Drawable[]
+                            {
+                                content = new Container
+                                {
+                                    AutoSizeAxes = Axes.Y,
+                                    RelativeSizeAxes = Axes.X,
+                                },
                             }
                         },
-                        new Drawable[]
-                        {
-                            content = new Container
-                            {
-                                AutoSizeAxes = Axes.Y,
-                                RelativeSizeAxes = Axes.X,
-                            },
-                        }
                     },
                 },
                 loading = new LoadingSpinner(),

osu.Game/Online/Leaderboards/LeaderboardScore.cs

@@ -58,6 +58,9 @@ namespace osu.Game.Online.Leaderboards
         [Resolved(CanBeNull = true)]
         private DialogOverlay dialogOverlay { get; set; }
 
+        [Resolved(CanBeNull = true)]
+        private SongSelect songSelect { get; set; }
+
         public LeaderboardScore(ScoreInfo score, int? rank, bool allowHighlight = true)
         {
             this.score = score;
@@ -373,6 +376,9 @@ namespace osu.Game.Online.Leaderboards
             {
                 List<MenuItem> items = new List<MenuItem>();
 
+                if (score.Mods.Length > 0 && modsContainer.Any(s => s.IsHovered) && songSelect != null)
+                    items.Add(new OsuMenuItem("Use these mods", MenuItemType.Highlighted, () => songSelect.Mods.Value = score.Mods));
+
                 if (score.ID != 0)
                     items.Add(new OsuMenuItem("Delete", MenuItemType.Destructive, () => dialogOverlay?.Push(new LocalScoreDeleteDialog(score))));
 

osu.Game/Online/Multiplayer/Room.cs

@@ -16,54 +16,58 @@ namespace osu.Game.Online.Multiplayer
     {
         [Cached]
         [JsonProperty("id")]
-        public Bindable<int?> RoomID { get; private set; } = new Bindable<int?>();
+        public readonly Bindable<int?> RoomID = new Bindable<int?>();
 
         [Cached]
         [JsonProperty("name")]
-        public Bindable<string> Name { get; private set; } = new Bindable<string>();
+        public readonly Bindable<string> Name = new Bindable<string>();
 
         [Cached]
         [JsonProperty("host")]
-        public Bindable<User> Host { get; private set; } = new Bindable<User>();
+        public readonly Bindable<User> Host = new Bindable<User>();
 
         [Cached]
         [JsonProperty("playlist")]
-        public BindableList<PlaylistItem> Playlist { get; private set; } = new BindableList<PlaylistItem>();
+        public readonly BindableList<PlaylistItem> Playlist = new BindableList<PlaylistItem>();
 
         [Cached]
         [JsonProperty("channel_id")]
-        public Bindable<int> ChannelId { get; private set; } = new Bindable<int>();
+        public readonly Bindable<int> ChannelId = new Bindable<int>();
+
+        [Cached]
+        [JsonProperty("category")]
+        public readonly Bindable<RoomCategory> Category = new Bindable<RoomCategory>();
 
         [Cached]
         [JsonIgnore]
-        public Bindable<TimeSpan> Duration { get; private set; } = new Bindable<TimeSpan>(TimeSpan.FromMinutes(30));
+        public readonly Bindable<TimeSpan> Duration = new Bindable<TimeSpan>(TimeSpan.FromMinutes(30));
 
         [Cached]
         [JsonIgnore]
-        public Bindable<int?> MaxAttempts { get; private set; } = new Bindable<int?>();
+        public readonly Bindable<int?> MaxAttempts = new Bindable<int?>();
 
         [Cached]
         [JsonIgnore]
-        public Bindable<RoomStatus> Status { get; private set; } = new Bindable<RoomStatus>(new RoomStatusOpen());
+        public readonly Bindable<RoomStatus> Status = new Bindable<RoomStatus>(new RoomStatusOpen());
 
         [Cached]
         [JsonIgnore]
-        public Bindable<RoomAvailability> Availability { get; private set; } = new Bindable<RoomAvailability>();
+        public readonly Bindable<RoomAvailability> Availability = new Bindable<RoomAvailability>();
 
         [Cached]
         [JsonIgnore]
-        public Bindable<GameType> Type { get; private set; } = new Bindable<GameType>(new GameTypeTimeshift());
+        public readonly Bindable<GameType> Type = new Bindable<GameType>(new GameTypeTimeshift());
 
         [Cached]
         [JsonIgnore]
-        public Bindable<int?> MaxParticipants { get; private set; } = new Bindable<int?>();
+        public readonly Bindable<int?> MaxParticipants = new Bindable<int?>();
 
         [Cached]
         [JsonProperty("recent_participants")]
-        public BindableList<User> RecentParticipants { get; private set; } = new BindableList<User>();
+        public readonly BindableList<User> RecentParticipants = new BindableList<User>();
 
         [Cached]
-        public Bindable<int> ParticipantCount { get; private set; } = new Bindable<int>();
+        public readonly Bindable<int> ParticipantCount = new Bindable<int>();
 
         // todo: TEMPORARY
         [JsonProperty("participant_count")]
@@ -83,7 +87,7 @@ namespace osu.Game.Online.Multiplayer
         // Only supports retrieval for now
         [Cached]
         [JsonProperty("ends_at")]
-        public Bindable<DateTimeOffset> EndDate { get; private set; } = new Bindable<DateTimeOffset>();
+        public readonly Bindable<DateTimeOffset> EndDate = new Bindable<DateTimeOffset>();
 
         // Todo: Find a better way to do this (https://github.com/ppy/osu-framework/issues/1930)
         [JsonProperty("max_attempts", DefaultValueHandling = DefaultValueHandling.Ignore)]
@@ -97,7 +101,7 @@ namespace osu.Game.Online.Multiplayer
         /// The position of this <see cref="Room"/> in the list. This is not read from or written to the API.
         /// </summary>
         [JsonIgnore]
-        public Bindable<int> Position { get; private set; } = new Bindable<int>(-1);
+        public readonly Bindable<int> Position = new Bindable<int>(-1);
 
         public void CopyFrom(Room other)
         {
@@ -130,7 +134,7 @@ namespace osu.Game.Online.Multiplayer
                 RecentParticipants.AddRange(other.RecentParticipants);
             }
 
-            Position = other.Position;
+            Position.Value = other.Position.Value;
         }
 
         public bool ShouldSerializeRoomID() => false;

osu.Game/Online/Multiplayer/RoomCategory.cs

@@ -0,0 +1,11 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+namespace osu.Game.Online.Multiplayer
+{
+    public enum RoomCategory
+    {
+        Normal,
+        Spotlight
+    }
+}

osu.Game/OsuGame.cs

@@ -890,6 +890,10 @@ namespace osu.Game
                     beatmapListing.ToggleVisibility();
                     return true;
 
+                case GlobalAction.ToggleNotifications:
+                    notifications.ToggleVisibility();
+                    return true;
+
                 case GlobalAction.ToggleGameplayMouseButtons:
                     LocalConfig.Set(OsuSetting.MouseDisableButtons, !LocalConfig.Get<bool>(OsuSetting.MouseDisableButtons));
                     return true;

osu.Game/Overlays/BeatmapListing/Panels/BeatmapPanelDownloadButton.cs

@@ -81,7 +81,7 @@ namespace osu.Game.Overlays.BeatmapListing.Panels
                 {
                     case DownloadState.LocallyAvailable:
                         button.Enabled.Value = true;
-                        button.TooltipText = string.Empty;
+                        button.TooltipText = "Go to beatmap";
                         break;
 
                     default:

osu.Game/Overlays/Comments/CommentsHeader.cs

@@ -86,7 +86,7 @@ namespace osu.Game.Overlays.Comments
                         {
                             Anchor = Anchor.CentreLeft,
                             Origin = Anchor.CentreLeft,
-                            Font = OsuFont.GetFont(size: 12),
+                            Font = OsuFont.GetFont(size: 12, weight: FontWeight.SemiBold),
                             Text = @"Show deleted"
                         }
                     },

osu.Game/Overlays/MusicController.cs

@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Audio.Track;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Input.Bindings;
@@ -71,7 +72,7 @@ namespace osu.Game.Overlays
             managerRemoved = beatmaps.ItemRemoved.GetBoundCopy();
             managerRemoved.BindValueChanged(beatmapRemoved);
 
-            beatmapSets.AddRange(beatmaps.GetAllUsableBeatmapSets(IncludedDetails.Minimal).OrderBy(_ => RNG.Next()));
+            beatmapSets.AddRange(beatmaps.GetAllUsableBeatmapSets(IncludedDetails.Minimal, true).OrderBy(_ => RNG.Next()));
         }
 
         protected override void LoadComplete()
@@ -133,6 +134,29 @@ namespace osu.Game.Overlays
             });
         }
 
+        /// <summary>
+        /// Ensures music is playing, no matter what, unless the user has explicitly paused.
+        /// This means that if the current beatmap has a virtual track (see <see cref="TrackVirtual"/>) a new beatmap will be selected.
+        /// </summary>
+        public void EnsurePlayingSomething()
+        {
+            if (IsUserPaused) return;
+
+            var track = current?.Track;
+
+            if (track == null || track is TrackVirtual)
+            {
+                if (beatmap.Disabled)
+                    return;
+
+                NextTrack();
+            }
+            else if (!IsPlaying)
+            {
+                Play();
+            }
+        }
+
         /// <summary>
         /// Start playing the current track (if not already playing).
         /// </summary>
@@ -144,13 +168,7 @@ namespace osu.Game.Overlays
             IsUserPaused = false;
 
             if (track == null)
-            {
-                if (beatmap.Disabled)
-                    return false;
-
-                next(true);
-                return true;
-            }
+                return false;
 
             if (restart)
                 track.Restart();
@@ -199,6 +217,9 @@ namespace osu.Game.Overlays
         /// <returns>The <see cref="PreviousTrackResult"/> that indicate the decided action.</returns>
         private PreviousTrackResult prev()
         {
+            if (beatmap.Disabled)
+                return PreviousTrackResult.None;
+
             var currentTrackPosition = current?.Track.CurrentTime;
 
             if (currentTrackPosition >= restart_cutoff_point)
@@ -228,10 +249,12 @@ namespace osu.Game.Overlays
         /// </summary>
         public void NextTrack() => Schedule(() => next());
 
-        private bool next(bool instant = false)
+        private bool next()
         {
-            if (!instant)
-                queuedDirection = TrackChangeDirection.Next;
+            if (beatmap.Disabled)
+                return false;
+
+            queuedDirection = TrackChangeDirection.Next;
 
             var playable = BeatmapSets.SkipWhile(i => i.ID != current.BeatmapSetInfo.ID).ElementAtOrDefault(1) ?? BeatmapSets.FirstOrDefault();
 

osu.Game/Overlays/News/NewsCard.cs

@@ -0,0 +1,198 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using osu.Framework.Allocation;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+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 osu.Game.Graphics.UserInterface;
+using osu.Game.Online.API.Requests.Responses;
+
+namespace osu.Game.Overlays.News
+{
+    public class NewsCard : CompositeDrawable
+    {
+        [Resolved]
+        private OverlayColourProvider colourProvider { get; set; }
+
+        private readonly APINewsPost post;
+
+        private Box background;
+        private TextFlowContainer main;
+
+        public NewsCard(APINewsPost post)
+        {
+            this.post = post;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+            Masking = true;
+            CornerRadius = 6;
+
+            NewsBackground bg;
+
+            InternalChildren = new Drawable[]
+            {
+                background = new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = colourProvider.Background4
+                },
+                new FillFlowContainer
+                {
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Direction = FillDirection.Vertical,
+                    Children = new Drawable[]
+                    {
+                        new Container
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            Height = 160,
+                            Masking = true,
+                            CornerRadius = 6,
+                            Children = new Drawable[]
+                            {
+                                new DelayedLoadWrapper(bg = new NewsBackground(post.FirstImage)
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                    FillMode = FillMode.Fill,
+                                    Anchor = Anchor.Centre,
+                                    Origin = Anchor.Centre,
+                                    Alpha = 0
+                                })
+                                {
+                                    RelativeSizeAxes = Axes.Both
+                                },
+                                new DateContainer(post.PublishedAt)
+                                {
+                                    Anchor = Anchor.TopRight,
+                                    Origin = Anchor.TopRight,
+                                    Margin = new MarginPadding
+                                    {
+                                        Top = 10,
+                                        Right = 15
+                                    }
+                                }
+                            }
+                        },
+                        new Container
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y,
+                            Padding = new MarginPadding
+                            {
+                                Horizontal = 15,
+                                Vertical = 10
+                            },
+                            Child = main = new TextFlowContainer
+                            {
+                                RelativeSizeAxes = Axes.X,
+                                AutoSizeAxes = Axes.Y
+                            }
+                        }
+                    }
+                },
+                new HoverClickSounds()
+            };
+
+            bg.OnLoadComplete += d => d.FadeIn(250, Easing.In);
+
+            main.AddParagraph(post.Title, t => t.Font = OsuFont.GetFont(size: 20, weight: FontWeight.SemiBold));
+            main.AddParagraph(post.Preview, t => t.Font = OsuFont.GetFont(size: 12)); // Should use sans-serif font
+            main.AddParagraph("by ", t => t.Font = OsuFont.GetFont(size: 12));
+            main.AddText(post.Author, t => t.Font = OsuFont.GetFont(size: 12, weight: FontWeight.SemiBold));
+        }
+
+        protected override bool OnHover(HoverEvent e)
+        {
+            background.FadeColour(colourProvider.Background3, 200, Easing.OutQuint);
+            return true;
+        }
+
+        protected override void OnHoverLost(HoverLostEvent e)
+        {
+            background.FadeColour(colourProvider.Background4, 200, Easing.OutQuint);
+            base.OnHoverLost(e);
+        }
+
+        [LongRunningLoad]
+        private class NewsBackground : Sprite
+        {
+            private readonly string sourceUrl;
+
+            public NewsBackground(string sourceUrl)
+            {
+                this.sourceUrl = sourceUrl;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(LargeTextureStore store)
+            {
+                Texture = store.Get(createUrl(sourceUrl));
+            }
+
+            private string createUrl(string source)
+            {
+                if (string.IsNullOrEmpty(source))
+                    return "Headers/news";
+
+                if (source.StartsWith('/'))
+                    return "https://osu.ppy.sh" + source;
+
+                return source;
+            }
+        }
+
+        private class DateContainer : CircularContainer, IHasCustomTooltip
+        {
+            public ITooltip GetCustomTooltip() => new DateTooltip();
+
+            public object TooltipContent => date;
+
+            private readonly DateTimeOffset date;
+
+            public DateContainer(DateTimeOffset date)
+            {
+                this.date = date;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OverlayColourProvider colourProvider)
+            {
+                AutoSizeAxes = Axes.Both;
+                Masking = true;
+                Children = new Drawable[]
+                {
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = colourProvider.Background6.Opacity(0.5f)
+                    },
+                    new OsuSpriteText
+                    {
+                        Text = date.ToString("d MMM yyyy").ToUpper(),
+                        Font = OsuFont.GetFont(size: 10, weight: FontWeight.SemiBold),
+                        Margin = new MarginPadding
+                        {
+                            Horizontal = 20,
+                            Vertical = 5
+                        }
+                    }
+                };
+            }
+        }
+    }
+}

osu.Game/Overlays/OverlaySortTabControl.cs

@@ -30,6 +30,14 @@ namespace osu.Game.Overlays
             set => current.Current = value;
         }
 
+        public string Title
+        {
+            get => text.Text;
+            set => text.Text = value;
+        }
+
+        private readonly OsuSpriteText text;
+
         public OverlaySortTabControl()
         {
             AutoSizeAxes = Axes.Both;
@@ -40,11 +48,11 @@ namespace osu.Game.Overlays
                 Spacing = new Vector2(10, 0),
                 Children = new Drawable[]
                 {
-                    new OsuSpriteText
+                    text = new OsuSpriteText
                     {
                         Anchor = Anchor.CentreLeft,
                         Origin = Anchor.CentreLeft,
-                        Font = OsuFont.GetFont(size: 12),
+                        Font = OsuFont.GetFont(size: 12, weight: FontWeight.SemiBold),
                         Text = @"Sort by"
                     },
                     CreateControl().With(c =>
@@ -133,7 +141,7 @@ namespace osu.Game.Overlays
                         {
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
-                            Font = OsuFont.GetFont(size: 12),
+                            Font = OsuFont.GetFont(size: 12, weight: FontWeight.SemiBold),
                             Text = (value as Enum)?.GetDescription() ?? value.ToString()
                         }
                     }
@@ -163,7 +171,7 @@ namespace osu.Game.Overlays
 
                 ContentColour = Active.Value && !IsHovered ? colourProvider.Light1 : Color4.White;
 
-                text.Font = text.Font.With(weight: Active.Value ? FontWeight.Bold : FontWeight.Medium);
+                text.Font = text.Font.With(weight: Active.Value ? FontWeight.Bold : FontWeight.SemiBold);
             }
         }
     }

osu.Game/Overlays/Rankings/RankingsSortTabControl.cs

@@ -0,0 +1,19 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+namespace osu.Game.Overlays.Rankings
+{
+    public class RankingsSortTabControl : OverlaySortTabControl<RankingsSortCriteria>
+    {
+        public RankingsSortTabControl()
+        {
+            Title = "Show";
+        }
+    }
+
+    public enum RankingsSortCriteria
+    {
+        All,
+        Friends
+    }
+}

osu.Game/Overlays/SearchableList/DisplayStyleControl.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;
 using osu.Framework.Bindables;
 using osuTK;
 using osu.Framework.Graphics;
@@ -11,44 +10,23 @@ using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Overlays.SearchableList
 {
-    public class DisplayStyleControl<T> : Container
-        where T : struct, Enum
+    public class DisplayStyleControl : CompositeDrawable
     {
-        public readonly SlimEnumDropdown<T> Dropdown;
         public readonly Bindable<PanelDisplayStyle> DisplayStyle = new Bindable<PanelDisplayStyle>();
 
         public DisplayStyleControl()
         {
             AutoSizeAxes = Axes.Both;
 
-            Children = new[]
+            InternalChild = new FillFlowContainer
             {
-                new FillFlowContainer
+                AutoSizeAxes = Axes.Both,
+                Spacing = new Vector2(5f, 0f),
+                Direction = FillDirection.Horizontal,
+                Children = new[]
                 {
-                    AutoSizeAxes = Axes.Both,
-                    Anchor = Anchor.TopRight,
-                    Origin = Anchor.TopRight,
-                    Spacing = new Vector2(10f, 0f),
-                    Direction = FillDirection.Horizontal,
-                    Children = new Drawable[]
-                    {
-                        new FillFlowContainer
-                        {
-                            AutoSizeAxes = Axes.Both,
-                            Spacing = new Vector2(5f, 0f),
-                            Direction = FillDirection.Horizontal,
-                            Children = new[]
-                            {
-                                new DisplayStyleToggleButton(FontAwesome.Solid.ThLarge, PanelDisplayStyle.Grid, DisplayStyle),
-                                new DisplayStyleToggleButton(FontAwesome.Solid.ListUl, PanelDisplayStyle.List, DisplayStyle),
-                            },
-                        },
-                        Dropdown = new SlimEnumDropdown<T>
-                        {
-                            RelativeSizeAxes = Axes.None,
-                            Width = 160f,
-                        },
-                    },
+                    new DisplayStyleToggleButton(FontAwesome.Solid.ThLarge, PanelDisplayStyle.Grid, DisplayStyle),
+                    new DisplayStyleToggleButton(FontAwesome.Solid.ListUl, PanelDisplayStyle.List, DisplayStyle),
                 },
             };
 

osu.Game/Overlays/SearchableList/SearchableListFilterControl.cs

@@ -19,12 +19,14 @@ namespace osu.Game.Overlays.SearchableList
     {
         private const float padding = 10;
 
-        private readonly Container filterContainer;
+        private readonly Drawable filterContainer;
+        private readonly Drawable rightFilterContainer;
         private readonly Box tabStrip;
 
         public readonly SearchTextBox Search;
         public readonly PageTabControl<TTab> Tabs;
-        public readonly DisplayStyleControl<TCategory> DisplayStyleControl;
+        public readonly SlimEnumDropdown<TCategory> Dropdown;
+        public readonly DisplayStyleControl DisplayStyleControl;
 
         protected abstract Color4 BackgroundColour { get; }
         protected abstract TTab DefaultTab { get; }
@@ -42,7 +44,7 @@ namespace osu.Game.Overlays.SearchableList
 
             var controls = CreateSupplementaryControls();
             Container controlsContainer;
-            Children = new Drawable[]
+            Children = new[]
             {
                 filterContainer = new Container
                 {
@@ -104,11 +106,27 @@ namespace osu.Game.Overlays.SearchableList
                         },
                     },
                 },
-                DisplayStyleControl = new DisplayStyleControl<TCategory>
+                rightFilterContainer = new FillFlowContainer
                 {
                     Anchor = Anchor.TopRight,
                     Origin = Anchor.TopRight,
-                },
+                    AutoSizeAxes = Axes.Both,
+                    Children = new Drawable[]
+                    {
+                        Dropdown = new SlimEnumDropdown<TCategory>
+                        {
+                            Anchor = Anchor.TopRight,
+                            Origin = Anchor.TopRight,
+                            RelativeSizeAxes = Axes.None,
+                            Width = 160f,
+                        },
+                        DisplayStyleControl = new DisplayStyleControl
+                        {
+                            Anchor = Anchor.TopRight,
+                            Origin = Anchor.TopRight,
+                        },
+                    }
+                }
             };
 
             if (controls != null) controlsContainer.Children = new[] { controls };
@@ -116,8 +134,8 @@ namespace osu.Game.Overlays.SearchableList
             Tabs.Current.Value = DefaultTab;
             Tabs.Current.TriggerChange();
 
-            DisplayStyleControl.Dropdown.Current.Value = DefaultCategory;
-            DisplayStyleControl.Dropdown.Current.TriggerChange();
+            Dropdown.Current.Value = DefaultCategory;
+            Dropdown.Current.TriggerChange();
         }
 
         [BackgroundDependencyLoader]
@@ -131,13 +149,11 @@ namespace osu.Game.Overlays.SearchableList
             base.Update();
 
             Height = filterContainer.Height;
-            DisplayStyleControl.Margin = new MarginPadding { Top = filterContainer.Height - 35, Right = SearchableListOverlay.WIDTH_PADDING };
+            rightFilterContainer.Margin = new MarginPadding { Top = filterContainer.Height - 30, Right = ContentHorizontalPadding };
         }
 
         private class FilterSearchTextBox : SearchTextBox
         {
-            protected override bool AllowCommit => true;
-
             [BackgroundDependencyLoader]
             private void load()
             {

osu.Game/Overlays/SocialOverlay.cs

@@ -72,7 +72,7 @@ namespace osu.Game.Overlays
             Filter.Tabs.Current.ValueChanged += _ => onFilterUpdate();
 
             Filter.DisplayStyleControl.DisplayStyle.ValueChanged += _ => recreatePanels();
-            Filter.DisplayStyleControl.Dropdown.Current.ValueChanged += _ => recreatePanels();
+            Filter.Dropdown.Current.ValueChanged += _ => recreatePanels();
 
             currentQuery.BindTo(Filter.Search.Current);
             currentQuery.ValueChanged += query =>
@@ -155,7 +155,7 @@ namespace osu.Game.Overlays
                     break;
             }
 
-            if (Filter.DisplayStyleControl.Dropdown.Current.Value == SortDirection.Descending)
+            if (Filter.Dropdown.Current.Value == SortDirection.Descending)
                 sortedUsers = sortedUsers.Reverse();
 
             var newPanels = new FillFlowContainer<UserPanel>

osu.Game/Overlays/Toolbar/Toolbar.cs

@@ -28,9 +28,6 @@ namespace osu.Game.Overlays.Toolbar
 
         private const double transition_time = 500;
 
-        private const float alpha_hovering = 0.8f;
-        private const float alpha_normal = 0.6f;
-
         private readonly Bindable<OverlayActivation> overlayActivationMode = new Bindable<OverlayActivation>(OverlayActivation.All);
 
         // Toolbar components like RulesetSelector should receive keyboard input events even when the toolbar is hidden.
@@ -103,7 +100,6 @@ namespace osu.Game.Overlays.Toolbar
 
         public class ToolbarBackground : Container
         {
-            private readonly Box solidBackground;
             private readonly Box gradientBackground;
 
             public ToolbarBackground()
@@ -111,11 +107,10 @@ namespace osu.Game.Overlays.Toolbar
                 RelativeSizeAxes = Axes.Both;
                 Children = new Drawable[]
                 {
-                    solidBackground = new Box
+                    new Box
                     {
                         RelativeSizeAxes = Axes.Both,
                         Colour = OsuColour.Gray(0.1f),
-                        Alpha = alpha_normal,
                     },
                     gradientBackground = new Box
                     {
@@ -131,14 +126,12 @@ namespace osu.Game.Overlays.Toolbar
 
             protected override bool OnHover(HoverEvent e)
             {
-                solidBackground.FadeTo(alpha_hovering, transition_time, Easing.OutQuint);
                 gradientBackground.FadeIn(transition_time, Easing.OutQuint);
                 return true;
             }
 
             protected override void OnHoverLost(HoverLostEvent e)
             {
-                solidBackground.FadeTo(alpha_normal, transition_time, Easing.OutQuint);
                 gradientBackground.FadeOut(transition_time, Easing.OutQuint);
             }
         }
@@ -146,7 +139,7 @@ namespace osu.Game.Overlays.Toolbar
         protected override void PopIn()
         {
             this.MoveToY(0, transition_time, Easing.OutQuint);
-            this.FadeIn(transition_time / 2, Easing.OutQuint);
+            this.FadeIn(transition_time / 4, Easing.OutQuint);
         }
 
         protected override void PopOut()
@@ -154,7 +147,7 @@ namespace osu.Game.Overlays.Toolbar
             userButton.StateContainer?.Hide();
 
             this.MoveToY(-DrawSize.Y, transition_time, Easing.OutQuint);
-            this.FadeOut(transition_time);
+            this.FadeOut(transition_time, Easing.InQuint);
         }
     }
 }

osu.Game/Rulesets/Judgements/DrawableJudgement.cs

@@ -1,11 +1,14 @@
 // 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.Diagnostics;
+using JetBrains.Annotations;
 using osuTK;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Pooling;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
@@ -18,19 +21,20 @@ namespace osu.Game.Rulesets.Judgements
     /// <summary>
     /// A drawable object which visualises the hit result of a <see cref="Judgements.Judgement"/>.
     /// </summary>
-    public class DrawableJudgement : CompositeDrawable
+    public class DrawableJudgement : PoolableDrawable
     {
         private const float judgement_size = 128;
 
         [Resolved]
         private OsuColour colours { get; set; }
 
-        protected readonly JudgementResult Result;
+        public JudgementResult Result { get; private set; }
+        public DrawableHitObject JudgedObject { get; private set; }
 
-        public readonly DrawableHitObject JudgedObject;
+        protected Container JudgementBody { get; private set; }
+        protected SpriteText JudgementText { get; private set; }
 
-        protected Container JudgementBody;
-        protected SpriteText JudgementText;
+        private SkinnableDrawable bodyDrawable;
 
         /// <summary>
         /// Duration of initial fade in.
@@ -48,29 +52,21 @@ namespace osu.Game.Rulesets.Judgements
         /// <param name="result">The judgement to visualise.</param>
         /// <param name="judgedObject">The object which was judged.</param>
         public DrawableJudgement(JudgementResult result, DrawableHitObject judgedObject)
+            : this()
         {
-            Result = result;
-            JudgedObject = judgedObject;
+            Apply(result, judgedObject);
+        }
 
+        public DrawableJudgement()
+        {
             Size = new Vector2(judgement_size);
+            Origin = Anchor.Centre;
         }
 
         [BackgroundDependencyLoader]
         private void load()
         {
-            InternalChild = JudgementBody = new Container
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                RelativeSizeAxes = Axes.Both,
-                Child = new SkinnableDrawable(new GameplaySkinComponent<HitResult>(Result.Type), _ => JudgementText = new OsuSpriteText
-                {
-                    Text = Result.Type.GetDescription().ToUpperInvariant(),
-                    Font = OsuFont.Numeric.With(size: 20),
-                    Colour = colours.ForHitResult(Result.Type),
-                    Scale = new Vector2(0.85f, 1),
-                }, confineMode: ConfineMode.NoScaling)
-            };
+            prepareDrawables();
         }
 
         protected virtual void ApplyHitAnimations()
@@ -81,11 +77,26 @@ namespace osu.Game.Rulesets.Judgements
             this.Delay(FadeOutDelay).FadeOut(400);
         }
 
-        protected override void LoadComplete()
+        public virtual void Apply([NotNull] JudgementResult result, [CanBeNull] DrawableHitObject judgedObject)
         {
-            base.LoadComplete();
+            Result = result;
+            JudgedObject = judgedObject;
+        }
+
+        protected override void PrepareForUse()
+        {
+            base.PrepareForUse();
+
+            Debug.Assert(Result != null);
+
+            prepareDrawables();
+
+            bodyDrawable.ResetAnimation();
 
             this.FadeInFromZero(FadeInDuration, Easing.OutQuint);
+            JudgementBody.ScaleTo(1);
+            JudgementBody.RotateTo(0);
+            JudgementBody.MoveTo(Vector2.Zero);
 
             switch (Result.Type)
             {
@@ -109,5 +120,31 @@ namespace osu.Game.Rulesets.Judgements
 
             Expire(true);
         }
+
+        private HitResult? currentDrawableType;
+
+        private void prepareDrawables()
+        {
+            var type = Result?.Type ?? HitResult.Perfect; //TODO: better default type from ruleset
+
+            if (type == currentDrawableType)
+                return;
+
+            InternalChild = JudgementBody = new Container
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                RelativeSizeAxes = Axes.Both,
+                Child = bodyDrawable = new SkinnableDrawable(new GameplaySkinComponent<HitResult>(type), _ => JudgementText = new OsuSpriteText
+                {
+                    Text = type.GetDescription().ToUpperInvariant(),
+                    Font = OsuFont.Numeric.With(size: 20),
+                    Colour = colours.ForHitResult(type),
+                    Scale = new Vector2(0.85f, 1),
+                }, confineMode: ConfineMode.NoScaling)
+            };
+
+            currentDrawableType = type;
+        }
     }
 }

osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs

@@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Mods
         public BindableNumber<float> DrainRate { get; } = new BindableFloat
         {
             Precision = 0.1f,
-            MinValue = 1,
+            MinValue = 0,
             MaxValue = 10,
             Default = 5,
             Value = 5,
@@ -47,7 +47,7 @@ namespace osu.Game.Rulesets.Mods
         public BindableNumber<float> OverallDifficulty { get; } = new BindableFloat
         {
             Precision = 0.1f,
-            MinValue = 1,
+            MinValue = 0,
             MaxValue = 10,
             Default = 5,
             Value = 5,

osu.Game/Rulesets/Scoring/DrainingHealthProcessor.cs

@@ -114,7 +114,9 @@ namespace osu.Game.Rulesets.Scoring
         protected override void ApplyResultInternal(JudgementResult result)
         {
             base.ApplyResultInternal(result);
-            healthIncreases.Add((result.HitObject.GetEndTime() + result.TimeOffset, GetHealthIncreaseFor(result)));
+
+            if (!result.Judgement.IsBonus)
+                healthIncreases.Add((result.HitObject.GetEndTime() + result.TimeOffset, GetHealthIncreaseFor(result)));
         }
 
         protected override void Reset(bool storeResults)

osu.Game/Rulesets/Scoring/ScoreProcessor.cs

@@ -252,6 +252,12 @@ namespace osu.Game.Rulesets.Scoring
             HighestCombo.Value = 0;
         }
 
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            hitEvents.Clear();
+        }
+
         /// <summary>
         /// Retrieve a score populated with data for the current play this processor is responsible for.
         /// </summary>
@@ -269,7 +275,7 @@ namespace osu.Game.Rulesets.Scoring
             foreach (var result in Enum.GetValues(typeof(HitResult)).OfType<HitResult>().Where(r => r > HitResult.None && hitWindows.IsHitResultAllowed(r)))
                 score.Statistics[result] = GetStatistic(result);
 
-            score.HitEvents = new List<HitEvent>(hitEvents);
+            score.HitEvents = hitEvents;
         }
 
         /// <summary>

osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs

@@ -21,12 +21,10 @@ namespace osu.Game.Screens.Backgrounds
 
         private int currentDisplay;
         private const int background_count = 7;
-
-        private string backgroundName => $@"Menu/menu-background-{currentDisplay % background_count + 1}";
-
         private Bindable<User> user;
         private Bindable<Skin> skin;
         private Bindable<BackgroundSource> mode;
+        private Bindable<IntroSequence> introSequence;
 
         [Resolved]
         private IBindable<WorkingBeatmap> beatmap { get; set; }
@@ -42,11 +40,13 @@ namespace osu.Game.Screens.Backgrounds
             user = api.LocalUser.GetBoundCopy();
             skin = skinManager.CurrentSkin.GetBoundCopy();
             mode = config.GetBindable<BackgroundSource>(OsuSetting.MenuBackgroundSource);
+            introSequence = config.GetBindable<IntroSequence>(OsuSetting.IntroSequence);
 
             user.ValueChanged += _ => Next();
             skin.ValueChanged += _ => Next();
             mode.ValueChanged += _ => Next();
             beatmap.ValueChanged += _ => Next();
+            introSequence.ValueChanged += _ => Next();
 
             currentDisplay = RNG.Next(0, background_count);
 
@@ -73,6 +73,18 @@ namespace osu.Game.Screens.Backgrounds
         private Background createBackground()
         {
             Background newBackground;
+            string backgroundName;
+
+            switch (introSequence.Value)
+            {
+                case IntroSequence.Welcome:
+                    backgroundName = "Intro/Welcome/menu-background";
+                    break;
+
+                default:
+                    backgroundName = $@"Menu/menu-background-{currentDisplay % background_count + 1}";
+                    break;
+            }
 
             if (user.Value?.IsSupporter ?? false)
             {

osu.Game/Screens/Menu/Disclaimer.cs

@@ -51,7 +51,7 @@ namespace osu.Game.Screens.Menu
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Icon = FontAwesome.Solid.Poo,
+                    Icon = FontAwesome.Solid.Flask,
                     Size = new Vector2(icon_size),
                     Y = icon_y,
                 },

osu.Game/Screens/Menu/MainMenu.cs

@@ -260,8 +260,7 @@ namespace osu.Game.Screens.Menu
             // we may have consumed our preloaded instance, so let's make another.
             preloadSongSelect();
 
-            if (Beatmap.Value.Track != null && music?.IsUserPaused != true)
-                Beatmap.Value.Track.Start();
+            music.EnsurePlayingSomething();
         }
 
         public override bool OnExiting(IScreen next)

osu.Game/Screens/Multi/Components/OverlinedDisplay.cs

@@ -1,131 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using osu.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
-using osuTK;
-
-namespace osu.Game.Screens.Multi.Components
-{
-    public abstract class OverlinedDisplay : MultiplayerComposite
-    {
-        protected readonly Container Content;
-
-        public override Axes RelativeSizeAxes
-        {
-            get => base.RelativeSizeAxes;
-            set
-            {
-                base.RelativeSizeAxes = value;
-                updateDimensions();
-            }
-        }
-
-        public override Axes AutoSizeAxes
-        {
-            get => base.AutoSizeAxes;
-            protected set
-            {
-                base.AutoSizeAxes = value;
-                updateDimensions();
-            }
-        }
-
-        private bool showLine = true;
-
-        public bool ShowLine
-        {
-            get => showLine;
-            set
-            {
-                showLine = value;
-                line.Alpha = value ? 1 : 0;
-            }
-        }
-
-        protected string Details
-        {
-            set => details.Text = value;
-        }
-
-        private readonly Circle line;
-        private readonly OsuSpriteText details;
-        private readonly GridContainer grid;
-
-        protected OverlinedDisplay(string title)
-        {
-            InternalChild = grid = new GridContainer
-            {
-                Content = new[]
-                {
-                    new Drawable[]
-                    {
-                        line = new Circle
-                        {
-                            RelativeSizeAxes = Axes.X,
-                            Height = 2,
-                            Margin = new MarginPadding { Bottom = 2 }
-                        },
-                    },
-                    new Drawable[]
-                    {
-                        new FillFlowContainer
-                        {
-                            AutoSizeAxes = Axes.Both,
-                            Direction = FillDirection.Horizontal,
-                            Margin = new MarginPadding { Top = 5 },
-                            Spacing = new Vector2(10, 0),
-                            Children = new Drawable[]
-                            {
-                                new OsuSpriteText
-                                {
-                                    Text = title,
-                                    Font = OsuFont.GetFont(size: 14, weight: FontWeight.SemiBold)
-                                },
-                                details = new OsuSpriteText
-                                {
-                                    Font = OsuFont.GetFont(size: 14, weight: FontWeight.SemiBold)
-                                },
-                            }
-                        },
-                    },
-                    new Drawable[]
-                    {
-                        Content = new Container { Padding = new MarginPadding { Top = 5 } }
-                    }
-                }
-            };
-
-            updateDimensions();
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            line.Colour = colours.Yellow;
-            details.Colour = colours.Yellow;
-        }
-
-        private void updateDimensions()
-        {
-            grid.RowDimensions = new[]
-            {
-                new Dimension(GridSizeMode.AutoSize),
-                new Dimension(GridSizeMode.AutoSize),
-                new Dimension(AutoSizeAxes.HasFlag(Axes.Y) ? GridSizeMode.AutoSize : GridSizeMode.Distributed),
-            };
-
-            // Assigning to none is done so that setting auto and relative size modes doesn't cause exceptions to be thrown
-            grid.AutoSizeAxes = Content.AutoSizeAxes = Axes.None;
-            grid.RelativeSizeAxes = Content.RelativeSizeAxes = Axes.None;
-
-            // Auto-size when required, otherwise eagerly relative-size
-            grid.AutoSizeAxes = Content.AutoSizeAxes = AutoSizeAxes;
-            grid.RelativeSizeAxes = Content.RelativeSizeAxes = ~AutoSizeAxes;
-        }
-    }
-}

osu.Game/Screens/Multi/Components/OverlinedHeader.cs

@@ -0,0 +1,89 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osuTK;
+
+namespace osu.Game.Screens.Multi.Components
+{
+    /// <summary>
+    /// A header used in the multiplayer interface which shows text / details beneath a line.
+    /// </summary>
+    public class OverlinedHeader : MultiplayerComposite
+    {
+        private bool showLine = true;
+
+        public bool ShowLine
+        {
+            get => showLine;
+            set
+            {
+                showLine = value;
+                line.Alpha = value ? 1 : 0;
+            }
+        }
+
+        public Bindable<string> Details = new Bindable<string>();
+
+        private readonly Circle line;
+        private readonly OsuSpriteText details;
+
+        public OverlinedHeader(string title)
+        {
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+
+            Margin = new MarginPadding { Bottom = 5 };
+
+            InternalChild = new FillFlowContainer
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Direction = FillDirection.Vertical,
+                Children = new Drawable[]
+                {
+                    line = new Circle
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        Height = 2,
+                        Margin = new MarginPadding { Bottom = 2 }
+                    },
+                    new FillFlowContainer
+                    {
+                        AutoSizeAxes = Axes.Both,
+                        Direction = FillDirection.Horizontal,
+                        Margin = new MarginPadding { Top = 5 },
+                        Spacing = new Vector2(10, 0),
+                        Children = new Drawable[]
+                        {
+                            new OsuSpriteText
+                            {
+                                Text = title,
+                                Font = OsuFont.GetFont(size: 14, weight: FontWeight.SemiBold)
+                            },
+                            details = new OsuSpriteText
+                            {
+                                Font = OsuFont.GetFont(size: 14, weight: FontWeight.SemiBold)
+                            },
+                        }
+                    },
+                }
+            };
+
+            Details.BindValueChanged(val => details.Text = val.NewValue);
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            line.Colour = colours.Yellow;
+            details.Colour = colours.Yellow;
+        }
+    }
+}

osu.Game/Screens/Multi/Components/OverlinedPlaylist.cs

@@ -1,33 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using osu.Framework.Allocation;
-using osu.Framework.Bindables;
-using osu.Framework.Graphics;
-using osu.Game.Online.Multiplayer;
-
-namespace osu.Game.Screens.Multi.Components
-{
-    public class OverlinedPlaylist : OverlinedDisplay
-    {
-        public readonly Bindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
-
-        private readonly DrawableRoomPlaylist playlist;
-
-        public OverlinedPlaylist(bool allowSelection)
-            : base("Playlist")
-        {
-            Content.Add(playlist = new DrawableRoomPlaylist(false, allowSelection)
-            {
-                RelativeSizeAxes = Axes.Both,
-                SelectedItem = { BindTarget = SelectedItem }
-            });
-        }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            playlist.Items.BindTo(Playlist);
-        }
-    }
-}

osu.Game/Screens/Multi/Components/ParticipantsDisplay.cs

@@ -2,26 +2,22 @@
 // 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.Game.Graphics.Containers;
 
 namespace osu.Game.Screens.Multi.Components
 {
-    public class OverlinedParticipants : OverlinedDisplay
+    public class ParticipantsDisplay : MultiplayerComposite
     {
-        public new Axes AutoSizeAxes
-        {
-            get => base.AutoSizeAxes;
-            set => base.AutoSizeAxes = value;
-        }
+        public Bindable<string> Details = new Bindable<string>();
 
-        public OverlinedParticipants(Direction direction)
-            : base("Recent participants")
+        public ParticipantsDisplay(Direction direction)
         {
             OsuScrollContainer scroll;
             ParticipantsList list;
 
-            Content.Add(scroll = new OsuScrollContainer(direction)
+            AddInternal(scroll = new OsuScrollContainer(direction)
             {
                 Child = list = new ParticipantsList()
             });
@@ -29,13 +25,21 @@ namespace osu.Game.Screens.Multi.Components
             switch (direction)
             {
                 case Direction.Horizontal:
+                    AutoSizeAxes = Axes.Y;
+                    RelativeSizeAxes = Axes.X;
+
                     scroll.RelativeSizeAxes = Axes.X;
                     scroll.Height = ParticipantsList.TILE_SIZE + OsuScrollContainer.SCROLL_BAR_HEIGHT + OsuScrollContainer.SCROLL_BAR_PADDING * 2;
-                    list.AutoSizeAxes = Axes.Both;
+
+                    list.RelativeSizeAxes = Axes.Y;
+                    list.AutoSizeAxes = Axes.X;
                     break;
 
                 case Direction.Vertical:
+                    RelativeSizeAxes = Axes.Both;
+
                     scroll.RelativeSizeAxes = Axes.Both;
+
                     list.RelativeSizeAxes = Axes.X;
                     list.AutoSizeAxes = Axes.Y;
                     break;
@@ -46,11 +50,10 @@ namespace osu.Game.Screens.Multi.Components
         private void load()
         {
             ParticipantCount.BindValueChanged(_ => setParticipantCount());
-            MaxParticipants.BindValueChanged(_ => setParticipantCount());
-
-            setParticipantCount();
+            MaxParticipants.BindValueChanged(_ => setParticipantCount(), true);
         }
 
-        private void setParticipantCount() => Details = MaxParticipants.Value != null ? $"{ParticipantCount.Value}/{MaxParticipants.Value}" : ParticipantCount.Value.ToString();
+        private void setParticipantCount() =>
+            Details.Value = MaxParticipants.Value != null ? $"{ParticipantCount.Value}/{MaxParticipants.Value}" : ParticipantCount.Value.ToString();
     }
 }

osu.Game/Screens/Multi/Components/StatusColouredContainer.cs

@@ -17,6 +17,9 @@ namespace osu.Game.Screens.Multi.Components
         [Resolved(typeof(Room), nameof(Room.Status))]
         private Bindable<RoomStatus> status { get; set; }
 
+        [Resolved(typeof(Room), nameof(Room.Category))]
+        private Bindable<RoomCategory> category { get; set; }
+
         public StatusColouredContainer(double transitionDuration = 100)
         {
             this.transitionDuration = transitionDuration;
@@ -25,7 +28,11 @@ namespace osu.Game.Screens.Multi.Components
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            status.BindValueChanged(s => this.FadeColour(s.NewValue.GetAppropriateColour(colours), transitionDuration), true);
+            status.BindValueChanged(s =>
+            {
+                this.FadeColour(category.Value == RoomCategory.Spotlight ? colours.Pink : s.NewValue.GetAppropriateColour(colours)
+                    , transitionDuration);
+            }, true);
         }
     }
 }

osu.Game/Screens/Multi/DrawableRoomPlaylist.cs

@@ -60,8 +60,6 @@ namespace osu.Game.Screens.Multi
             RequestDeletion = requestDeletion
         };
 
-        private void requestSelection(PlaylistItem item) => SelectedItem.Value = item;
-
         private void requestDeletion(PlaylistItem item)
         {
             if (SelectedItem.Value == item)

osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs

@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -48,7 +49,8 @@ namespace osu.Game.Screens.Multi
         private readonly Bindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
         private readonly BindableList<Mod> requiredMods = new BindableList<Mod>();
 
-        private readonly PlaylistItem item;
+        public readonly PlaylistItem Item;
+
         private readonly bool allowEdit;
         private readonly bool allowSelection;
 
@@ -57,8 +59,11 @@ namespace osu.Game.Screens.Multi
         public DrawableRoomPlaylistItem(PlaylistItem item, bool allowEdit, bool allowSelection)
             : base(item)
         {
-            this.item = item;
+            Item = item;
+
+            // TODO: edit support should be moved out into a derived class
             this.allowEdit = allowEdit;
+
             this.allowSelection = allowSelection;
 
             beatmap.BindTo(item.Beatmap);
@@ -102,14 +107,14 @@ namespace osu.Game.Screens.Multi
             difficultyIconContainer.Child = new DifficultyIcon(beatmap.Value, ruleset.Value) { Size = new Vector2(32) };
 
             beatmapText.Clear();
-            beatmapText.AddLink(item.Beatmap.ToString(), LinkAction.OpenBeatmap, item.Beatmap.Value.OnlineBeatmapID.ToString());
+            beatmapText.AddLink(Item.Beatmap.ToString(), LinkAction.OpenBeatmap, Item.Beatmap.Value.OnlineBeatmapID.ToString());
 
             authorText.Clear();
 
-            if (item.Beatmap?.Value?.Metadata?.Author != null)
+            if (Item.Beatmap?.Value?.Metadata?.Author != null)
             {
                 authorText.AddText("mapped by ");
-                authorText.AddUserLink(item.Beatmap.Value?.Metadata.Author);
+                authorText.AddUserLink(Item.Beatmap.Value?.Metadata.Author);
             }
 
             modDisplay.Current.Value = requiredMods.ToArray();
@@ -180,29 +185,33 @@ namespace osu.Game.Screens.Multi
                         }
                     }
                 },
-                new Container
+                new FillFlowContainer
                 {
                     Anchor = Anchor.CentreRight,
                     Origin = Anchor.CentreRight,
+                    Direction = FillDirection.Horizontal,
                     AutoSizeAxes = Axes.Both,
                     X = -18,
-                    Children = new Drawable[]
-                    {
-                        new PlaylistDownloadButton(item)
-                        {
-                            Size = new Vector2(50, 30)
-                        },
-                        new IconButton
-                        {
-                            Icon = FontAwesome.Solid.MinusSquare,
-                            Alpha = allowEdit ? 1 : 0,
-                            Action = () => RequestDeletion?.Invoke(Model),
-                        },
-                    }
+                    ChildrenEnumerable = CreateButtons()
                 }
             }
         };
 
+        protected virtual IEnumerable<Drawable> CreateButtons() =>
+            new Drawable[]
+            {
+                new PlaylistDownloadButton(Item)
+                {
+                    Size = new Vector2(50, 30)
+                },
+                new IconButton
+                {
+                    Icon = FontAwesome.Solid.MinusSquare,
+                    Alpha = allowEdit ? 1 : 0,
+                    Action = () => RequestDeletion?.Invoke(Model),
+                },
+            };
+
         protected override bool OnClick(ClickEvent e)
         {
             if (allowSelection)

osu.Game/Screens/Multi/DrawableRoomPlaylistWithResults.cs

@@ -0,0 +1,66 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Online.Multiplayer;
+
+namespace osu.Game.Screens.Multi
+{
+    public class DrawableRoomPlaylistWithResults : DrawableRoomPlaylist
+    {
+        public Action<PlaylistItem> RequestShowResults;
+
+        public DrawableRoomPlaylistWithResults()
+            : base(false, true)
+        {
+        }
+
+        protected override OsuRearrangeableListItem<PlaylistItem> CreateOsuDrawable(PlaylistItem item) =>
+            new DrawableRoomPlaylistItemWithResults(item, false, true)
+            {
+                RequestShowResults = () => RequestShowResults(item),
+                SelectedItem = { BindTarget = SelectedItem },
+            };
+
+        private class DrawableRoomPlaylistItemWithResults : DrawableRoomPlaylistItem
+        {
+            public Action RequestShowResults;
+
+            public DrawableRoomPlaylistItemWithResults(PlaylistItem item, bool allowEdit, bool allowSelection)
+                : base(item, allowEdit, allowSelection)
+            {
+            }
+
+            protected override IEnumerable<Drawable> CreateButtons() =>
+                base.CreateButtons().Prepend(new FilledIconButton
+                {
+                    Icon = FontAwesome.Solid.ChartPie,
+                    Action = () => RequestShowResults?.Invoke(),
+                    TooltipText = "View results"
+                });
+
+            private class FilledIconButton : IconButton
+            {
+                [BackgroundDependencyLoader]
+                private void load(OsuColour colours)
+                {
+                    Add(new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Depth = float.MaxValue,
+                        Colour = colours.Gray4,
+                    });
+                }
+            }
+        }
+    }
+}